fix(message-properties): properly convert symbols from described

noodlefrenzy · May 26, 2015 · 746f439 · 746f439
1 parent bee8a71
commit 746f439
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/types/message.js b/lib/types/message.js
@@ -160,17 +160,21 @@ Properties.fromDescribedType = function(describedType) {
     to: propertiesArr[idx++],
     subject: propertiesArr[idx++],
     replyTo: propertiesArr[idx++],
-    correlationId:
-      (typeof propertiesArr[idx++] === AMQPSymbol) ? propertiesArr[idx++].contents : propertiesArr[idx++],
-    contentType:
-      (typeof propertiesArr[idx++] === AMQPSymbol) ? propertiesArr[idx++].contents : propertiesArr[idx++],
+    correlationId: propertiesArr[idx++],
+    contentType: propertiesArr[idx++],
     contentEncoding: propertiesArr[idx++],
     absoluteExpiryTime: propertiesArr[idx++],
     creationTime: propertiesArr[idx++],
     groupId: propertiesArr[idx++],
     groupSequence: propertiesArr[idx++],
     replyToGroupId: propertiesArr[idx++]
   };
+
+  ['contentType', 'contentEncoding'].forEach(function(option) {
+    if (typeof options[option] === AMQPSymbol)
+      options[option] = options[option].contents;
+  });
+
   return new Properties(options);
 };