From b9cb270b8f771e5504e36469112daa6a32b24d63 Mon Sep 17 00:00:00 2001
From: frsyuki <frsyuki@users.sourceforge.jp>
Date: Sat, 22 May 2010 03:34:43 +0900
Subject: [PATCH] java: add Unpacker.unpack(MessageUnpackable) and
 Unpacker.tryUnpackNil()

---
 .../org/msgpack/BufferedUnpackerImpl.java     | 22 ++++++++++++++++++-
 java/src/main/java/org/msgpack/Unpacker.java  |  8 +++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/java/src/main/java/org/msgpack/BufferedUnpackerImpl.java b/java/src/main/java/org/msgpack/BufferedUnpackerImpl.java
index 0aba62b0..4b2f302d 100644
--- a/java/src/main/java/org/msgpack/BufferedUnpackerImpl.java
+++ b/java/src/main/java/org/msgpack/BufferedUnpackerImpl.java
@@ -63,6 +63,15 @@ abstract class BufferedUnpackerImpl extends UnpackerImpl {
 		}
 	}
 
+	private final boolean tryMore(int require) throws IOException, UnpackException {
+		while(filled - offset < require) {
+			if(!fill()) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	private final void advance(int length) {
 		offset += length;
 	}
@@ -275,6 +284,18 @@ abstract class BufferedUnpackerImpl extends UnpackerImpl {
 		return null;
 	}
 
+	final boolean tryUnpackNull() throws IOException {
+		if(!tryMore(1)) {
+			return false;
+		}
+		int b = buffer[offset] & 0xff;
+		if(b != 0xc0) {  // nil
+			return false;
+		}
+		advance(1);
+		return 1;
+	}
+
 	final boolean unpackBoolean() throws IOException, MessageTypeException {
 		more(1);
 		int b = buffer[offset] & 0xff;
@@ -389,7 +410,6 @@ abstract class BufferedUnpackerImpl extends UnpackerImpl {
 	}
 
 	final Object unpackObject() throws IOException {
-		// FIXME save state, restore state
 		UnpackResult result = new UnpackResult();
 		if(!next(result)) {
 			super.reset();
diff --git a/java/src/main/java/org/msgpack/Unpacker.java b/java/src/main/java/org/msgpack/Unpacker.java
index 7563b392..1917b9f3 100644
--- a/java/src/main/java/org/msgpack/Unpacker.java
+++ b/java/src/main/java/org/msgpack/Unpacker.java
@@ -544,5 +544,13 @@ public class Unpacker implements Iterable<Object> {
 	final public Object unpackObject() throws IOException {
 		return impl.unpackObject();
 	}
+
+	final void unpack(MessageUnpackable obj) throws IOException, MessageTypeException {
+		obj.unpackMessage(this);
+	}
+
+	final boolean tryUnpackNull() throws IOException {
+		return impl.tryUnpackNull();
+	}
 }