Merge pull request #4 from node-modules/overwrite

Fix 2 input bugs
node-modules · Aug 5, 2014 · 2839572 · 2839572
2 parents cddd474 + ea8faf4
commit 2839572
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/lib/input.js b/lib/input.js
@@ -379,6 +379,7 @@ proto._readExternalContents = function() {
 }
 
 proto._readArrayItems = function (obj) {
+  debug('>> _readArrayItems | position = %s', this.in.position().toString(16));
   // (int)<size> values[size]
   var size = this.readInt();
 
@@ -390,7 +391,7 @@ proto._readArrayItems = function (obj) {
     obj.$.push(this._readFieldValue({type: type}));
   }
 
-  debug('< _readArrayItems | size = %d, arr = %j', size, obj.$);
+  debug('<< _readArrayItems | size = %d, arr = %j', size, obj.$);
   return obj;
 }
 
@@ -410,6 +411,7 @@ proto._readFieldValue = function (field) {
   // `[`	// array
   // `L'	// object
   debug('> _readFieldValue | field = %j', field);
+
   switch (field.type) {
   case 'B':
     return this.in.getInt8();
@@ -428,15 +430,8 @@ proto._readFieldValue = function (field) {
   case 'Z':
     return this.in.get() !== 0;
   case 'L':
-    return this._readContent();
   case '[':
-    var obj = {
-      $class: {
-        name: field.classname,
-      },
-      $: []
-    };
-    return this._readArrayItems(obj);
+    return this._readContent();
   default:
     throw new Error('Illegal field type: ' + JSON.stringify(field));
   }

diff --git a/test/fixtures/out/NCommand.bin b/test/fixtures/out/NCommand.bin
diff --git a/test/fixtures/out/NCommand2.bin b/test/fixtures/out/NCommand2.bin
diff --git a/test/input.test.js b/test/input.test.js
@@ -431,5 +431,20 @@ describe('input.test.js', function () {
         datumId: 'some-datumId'
       });
     });
+
+    it('read NCommand', function() {
+      ObjectInputStream.read(utils.bytes('NCommand')).should.eql({
+        isNewVersion: false,
+        id: '10.62.50.148:2923:0',
+        name: 'queryServerlist',
+        params: null });
+
+      ObjectInputStream.read(utils.bytes('NCommand2')).should.eql({
+        isNewVersion: false,
+        id: null,
+        name: 'queryServerlist',
+        params: ['abc'] });
+    });
+
   });
 });