- fix UDT Value hitting the correct ctor (#509)

zakalibit · Alex Revetchi · web-flow · commit 1802d9b9600f · 2021-05-06T09:38:18.000-04:00
Co-authored-by: Alex Revetchi &lt;alex.revetchi@synchronoss.com&gt;
diff --git a/src/decoder.cpp b/src/decoder.cpp
@@ -148,10 +148,12 @@ Value Decoder::decode_value(const DataType::ConstPtr& data_type) {
     remaining_ -= size;
 
     int32_t count = 0;
-    if (data_type->is_collection() && !decoder.decode_int32(count)) {
-      return Value();
+    if (!data_type->is_collection()) {
+      return Value(data_type, decoder);
+    } else if (decoder.decode_int32(count)) {
+      return Value(data_type, count, decoder);
     }
-    return Value(data_type, count, decoder);
+    return Value();
   }
   return Value(data_type);
 }

Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,12 @@ Value Decoder::decode_value(const DataType::ConstPtr& data_type) {`
`148`	`148`	`remaining_ -= size;`
`149`	`149`
`150`	`150`	`int32_t count = 0;`
`151`		`- if (data_type->is_collection() && !decoder.decode_int32(count)) {`
`152`		`- return Value();`
	`151`	`+ if (!data_type->is_collection()) {`
	`152`	`+ return Value(data_type, decoder);`
	`153`	`+ } else if (decoder.decode_int32(count)) {`
	`154`	`+ return Value(data_type, count, decoder);`
`153`	`155`	`}`
`154`		`- return Value(data_type, count, decoder);`
	`156`	`+ return Value();`
`155`	`157`	`}`
`156`	`158`	`return Value(data_type);`
`157`	`159`	`}`