Unpacker#read returns null if nil

frsyuki · frsyuki · commit e4e3f4c3066d · 2011-09-17T03:03:04.000+09:00
diff --git a/src/main/java/org/msgpack/unpacker/AbstractUnpacker.java b/src/main/java/org/msgpack/unpacker/AbstractUnpacker.java
@@ -68,14 +68,22 @@ public Value readValue() throws IOException {
     }
 
 
+    protected abstract boolean tryReadNil() throws IOException;
+
     @Override
     public <T> T read(Class<T> klass) throws IOException {
+        if(tryReadNil()) {
+            return null;
+        }
         Template<? super T> tmpl = msgpack.lookup(klass);
         return (T) tmpl.read(this, null);
     }
 
     @Override
     public <T> T read(T to) throws IOException {
+        if(tryReadNil()) {
+            return null;
+        }
         Template<? super T> tmpl = msgpack.lookup((Class<T>) to.getClass());
         return (T) tmpl.read(this, to);
     }
diff --git a/src/main/java/org/msgpack/unpacker/Converter.java b/src/main/java/org/msgpack/unpacker/Converter.java
@@ -56,18 +56,18 @@ private void ensureValue() throws IOException {
         }
     }
 
-    //@Override
-    //public boolean tryReadNil() throws IOException {
-    //    stack.checkCount();
-    //    if(getTop().isNil()) {
-    //        stack.reduceCount();
-    //        if(stack.getDepth() == 0) {
-    //            value = null;
-    //        }
-    //        return true;
-    //    }
-    //    return false;
-    //}
+    @Override
+    public boolean tryReadNil() throws IOException {
+        stack.checkCount();
+        if(getTop().isNil()) {
+            stack.reduceCount();
+            if(stack.getDepth() == 0) {
+                value = null;
+            }
+            return true;
+        }
+        return false;
+    }
 
     @Override
     public boolean trySkipNil() throws IOException {
@@ -403,5 +403,9 @@ public void reset() {
         stack.clear();
         value = null;
     }
+
+    @Override
+    public void close() throws IOException {
+    }
 }
 
diff --git a/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java b/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java
@@ -319,19 +319,19 @@ private void readRawBodyCont() throws IOException {
         }
     }
 
-    //@Override
-    //public boolean tryReadNil() throws IOException {
-    //    stack.checkCount();
-    //    int b = getHeadByte() & 0xff;
-    //    if(b == 0xc0) {
-    //        // nil is read
-    //        stack.reduceCount();
-    //        headByte = REQUIRE_TO_READ_HEAD;
-    //        return true;
-    //    }
-    //    // not nil
-    //    return false;
-    //}
+    @Override
+    protected boolean tryReadNil() throws IOException {
+        stack.checkCount();
+        int b = getHeadByte() & 0xff;
+        if(b == 0xc0) {
+            // nil is read
+            stack.reduceCount();
+            headByte = REQUIRE_TO_READ_HEAD;
+            return true;
+        }
+        // not nil
+        return false;
+    }
 
     @Override
     public boolean trySkipNil() throws IOException {
