Merge pull request #97 from beatlevic/patch-1

Update serializers.js
simplereach · Mar 26, 2013 · eb5b21e · eb5b21e
2 parents 43182ec + 85d924a
commit eb5b21e
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/lib/marshal/serializers.js b/lib/marshal/serializers.js
@@ -165,7 +165,12 @@ Serializers.encodeDate = function(val){
  * @static
  */
 Serializers.encodeUUID = function(val){
-  return val.toBuffer();
+  if (val instanceof UUID.UUID) {
+    return val.toBuffer();
+  } else {
+    var uuid = new UUID.UUID(val);
+    return uuid.toBuffer();
+  }
 };
 
 /**
@@ -175,7 +180,12 @@ Serializers.encodeUUID = function(val){
  * @static
  */
 Serializers.encodeTimeUUID = function(val){
-  return val.toBuffer();
+  if (val instanceof UUID.TimeUUID) {
+    return val.toBuffer();
+  } else {
+    var timeUUID = new UUID.TimeUUID(val);
+    return timeUUID.toBuffer();
+  }
 };
 
 module.exports = Serializers;