fixToMapError

alibabacloud-go · Apr 3, 2020 · 4d8a898 · 4d8a898
1 parent 60574a9
commit 4d8a898
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/tea/tea.go b/tea/tea.go
@@ -558,8 +558,14 @@ func Merge(args ...interface{}) map[string]string {
 }
 
 func ToMap(args ...interface{}) map[string]interface{} {
+	isNotNil := false
 	finalArg := make(map[string]interface{})
 	for _, obj := range args {
+		if obj == nil {
+			continue
+		}
+		isNotNil = true
+
 		switch obj.(type) {
 		case map[string]string:
 			arg := obj.(map[string]string)
@@ -618,7 +624,7 @@ func ToMap(args ...interface{}) map[string]interface{} {
 		}
 	}
 
-	if len(finalArg) == 0 {
+	if !isNotNil {
 		return nil
 	}
 	return finalArg

diff --git a/tea/tea_test.go b/tea/tea_test.go
@@ -274,10 +274,10 @@ func TestToMap(t *testing.T) {
 
 	invalidStr := "sdfdg"
 	result = ToMap(invalidStr)
-	utils.AssertNil(t, result)
+	utils.AssertEqual(t, map[string]interface{}{}, result)
 
 	result = ToMap(10)
-	utils.AssertNil(t, result)
+	utils.AssertEqual(t, map[string]interface{}{}, result)
 
 	result = ToMap(nil)
 	utils.AssertNil(t, result)