code refactoring, fix error

moov-io · Oct 5, 2023 · 62da169 · 62da169
1 parent f30723f
commit 62da169
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/field/composite.go b/field/composite.go
@@ -206,14 +206,10 @@ func (f *Composite) Unmarshal(v interface{}) error {
 				return fmt.Errorf("failed to get data from field %s: %w", indexOrTag, err)
 			}
 		default: // Native types
-			// using new reflect value that has pointer instead of input data field
-			dummy := reflect.New(dataField.Type()).Elem()
-			err = messageField.Unmarshal(dummy)
+			err = messageField.Unmarshal(dataField)
 			if err != nil {
 				return fmt.Errorf("failed to get data from field %s: %w", indexOrTag, err)
 			}
-
-			dataField.Set(dummy)
 		}
 	}
 

diff --git a/field/string.go b/field/string.go
@@ -153,7 +153,7 @@ func (f *String) Unmarshal(v interface{}) error {
 }
 
 func (f *String) Marshal(v interface{}) error {
-	if v == nil || reflect.ValueOf(v).IsZero() {
+	if v == nil || (!reflect.ValueOf(v).CanInt() && reflect.ValueOf(v).IsZero()) {
 		f.value = ""
 		return nil
 	}

diff --git a/message.go b/message.go
@@ -513,14 +513,10 @@ func (m *Message) Unmarshal(v interface{}) error {
 				return fmt.Errorf("failed to get value from field %d: %w", fieldIndex, err)
 			}
 		default: // Native types
-			// using new reflect value that has pointer instead of input data field
-			dummy := reflect.New(dataField.Type()).Elem()
-			err = messageField.Unmarshal(dummy)
+			err = messageField.Unmarshal(dataField)
 			if err != nil {
 				return fmt.Errorf("failed to get value from field %d: %w", fieldIndex, err)
 			}
-
-			dataField.Set(dummy)
 		}
 	}