Merge pull request #25 from particle-iot/fix/default_fields

Do not ignore default-initialized message fields
particle-iot · Apr 29, 2020 · adecf92 · adecf92
2 parents 378a0ac + 7e709ad
commit adecf92
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/device.js b/src/device.js
@@ -535,10 +535,11 @@ export class Device extends DeviceBase {
 			}
 			if (req.reply) {
 				if (rep.data) {
-					r = Object.assign({}, r, req.reply.decode(rep.data));
+					// Parse the response message
+					r = Object.assign(req.reply.decode(rep.data), r);
 				} else {
-					// Return a message with default-initialized properties
-					r = Object.assign({}, r, req.reply.create());
+					// Create a message with default-initialized properties
+					r = Object.assign(req.reply.create(), r);
 				}
 			}
 			return r;