ArrayBufferInput(MessageBuffer) accepts to null to make it empty

frsyuki · frsyuki · commit d29e1108aabd · 2016-01-05T11:47:57.000-08:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java
@@ -26,11 +26,17 @@ public class ArrayBufferInput
         implements MessageBufferInput
 {
     private MessageBuffer buffer;
-    private boolean isRead = false;
+    private boolean isEmpty;
 
     public ArrayBufferInput(MessageBuffer buf)
     {
-        this.buffer = checkNotNull(buf, "input buffer is null");
+        this.buffer = buf;
+        if (buf == null) {
+            isEmpty = true;
+        }
+        else {
+            isEmpty = false;
+        }
     }
 
     public ArrayBufferInput(byte[] arr)
@@ -54,10 +60,10 @@ public MessageBuffer reset(MessageBuffer buf)
         MessageBuffer old = this.buffer;
         this.buffer = buf;
         if (buf == null) {
-            this.isRead = true;
+            isEmpty = true;
         }
         else {
-            this.isRead = false;
+            isEmpty = false;
         }
         return old;
     }
@@ -76,10 +82,10 @@ public void reset(byte[] arr, int offset, int len)
     public MessageBuffer next()
             throws IOException
     {
-        if (isRead) {
+        if (isEmpty) {
             return null;
         }
-        isRead = true;
+        isEmpty = true;
         return buffer;
     }
 
@@ -88,6 +94,6 @@ public void close()
             throws IOException
     {
         buffer = null;
-        isRead = true;
+        isEmpty = true;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,17 @@ public class ArrayBufferInput`
`26`	`26`	`implements MessageBufferInput`
`27`	`27`	`{`
`28`	`28`	`private MessageBuffer buffer;`
`29`		`- private boolean isRead = false;`
	`29`	`+ private boolean isEmpty;`
`30`	`30`
`31`	`31`	`public ArrayBufferInput(MessageBuffer buf)`
`32`	`32`	`{`
`33`		`- this.buffer = checkNotNull(buf, "input buffer is null");`
	`33`	`+ this.buffer = buf;`
	`34`	`+ if (buf == null) {`
	`35`	`+ isEmpty = true;`
	`36`	`+ }`
	`37`	`+ else {`
	`38`	`+ isEmpty = false;`
	`39`	`+ }`
`34`	`40`	`}`
`35`	`41`
`36`	`42`	`public ArrayBufferInput(byte[] arr)`
`@@ -54,10 +60,10 @@ public MessageBuffer reset(MessageBuffer buf)`
`54`	`60`	`MessageBuffer old = this.buffer;`
`55`	`61`	`this.buffer = buf;`
`56`	`62`	`if (buf == null) {`
`57`		`- this.isRead = true;`
	`63`	`+ isEmpty = true;`
`58`	`64`	`}`
`59`	`65`	`else {`
`60`		`- this.isRead = false;`
	`66`	`+ isEmpty = false;`
`61`	`67`	`}`
`62`	`68`	`return old;`
`63`	`69`	`}`
`@@ -76,10 +82,10 @@ public void reset(byte[] arr, int offset, int len)`
`76`	`82`	`public MessageBuffer next()`
`77`	`83`	`throws IOException`
`78`	`84`	`{`
`79`		`- if (isRead) {`
	`85`	`+ if (isEmpty) {`
`80`	`86`	`return null;`
`81`	`87`	`}`
`82`		`- isRead = true;`
	`88`	`+ isEmpty = true;`
`83`	`89`	`return buffer;`
`84`	`90`	`}`
`85`	`91`
`@@ -88,6 +94,6 @@ public void close()`
`88`	`94`	`throws IOException`
`89`	`95`	`{`
`90`	`96`	`buffer = null;`
`91`		`- isRead = true;`
	`97`	`+ isEmpty = true;`
`92`	`98`	`}`
`93`	`99`	`}`