Make it possible to set empty buffer to ArrayBufferInput be empty

frsyuki · frsyuki · commit 2caf80969116 · 2016-01-05T11:39:11.000-08:00
This change adds support to give null to ArrayBufferInput.reset method.
This lets applications control lifecycle of MessageBuffer (such as
releasing it to a buffer pool) before calling ArrayBufferInput.close().
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
@@ -40,20 +40,25 @@ public ArrayBufferInput(byte[] arr)
 
     public ArrayBufferInput(byte[] arr, int offset, int length)
     {
-        this(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, length));
+        this(MessageBuffer.wrap(checkNotNull(arr, "input array is null"), offset, length));
     }
 
     /**
-     * Reset buffer. This method doesn't close the old resource.
+     * Reset buffer. This method returns the old buffer.
      *
-     * @param buf new buffer
-     * @return the old resource
+     * @param buf new buffer. This can be null to make this input empty.
+     * @return the old buffer.
      */
     public MessageBuffer reset(MessageBuffer buf)
     {
         MessageBuffer old = this.buffer;
         this.buffer = buf;
-        this.isRead = false;
+        if (buf == null) {
+            this.isRead = true;
+        }
+        else {
+            this.isRead = false;
+        }
         return old;
     }
 
@@ -64,7 +69,7 @@ public void reset(byte[] arr)
 
     public void reset(byte[] arr, int offset, int len)
     {
-        reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, len));
+        reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null"), offset, len));
     }
 
     @Override
@@ -83,6 +88,6 @@ public void close()
             throws IOException
     {
         buffer = null;
-        isRead = false;
+        isRead = true;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -40,20 +40,25 @@ public ArrayBufferInput(byte[] arr)`
`40`	`40`
`41`	`41`	`public ArrayBufferInput(byte[] arr, int offset, int length)`
`42`	`42`	`{`
`43`		`- this(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, length));`
	`43`	`+ this(MessageBuffer.wrap(checkNotNull(arr, "input array is null"), offset, length));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
`47`		`- * Reset buffer. This method doesn't close the old resource.`
	`47`	`+ * Reset buffer. This method returns the old buffer.`
`48`	`48`	`*`
`49`		`- * @param buf new buffer`
`50`		`- * @return the old resource`
	`49`	`+ * @param buf new buffer. This can be null to make this input empty.`
	`50`	`+ * @return the old buffer.`
`51`	`51`	`*/`
`52`	`52`	`public MessageBuffer reset(MessageBuffer buf)`
`53`	`53`	`{`
`54`	`54`	`MessageBuffer old = this.buffer;`
`55`	`55`	`this.buffer = buf;`
`56`		`- this.isRead = false;`
	`56`	`+ if (buf == null) {`
	`57`	`+ this.isRead = true;`
	`58`	`+ }`
	`59`	`+ else {`
	`60`	`+ this.isRead = false;`
	`61`	`+ }`
`57`	`62`	`return old;`
`58`	`63`	`}`
`59`	`64`
`@@ -64,7 +69,7 @@ public void reset(byte[] arr)`
`64`	`69`
`65`	`70`	`public void reset(byte[] arr, int offset, int len)`
`66`	`71`	`{`
`67`		`- reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, len));`
	`72`	`+ reset(MessageBuffer.wrap(checkNotNull(arr, "input array is null"), offset, len));`
`68`	`73`	`}`
`69`	`74`
`70`	`75`	`@Override`
`@@ -83,6 +88,6 @@ public void close()`
`83`	`88`	`throws IOException`
`84`	`89`	`{`
`85`	`90`	`buffer = null;`
`86`		`- isRead = false;`
	`91`	`+ isRead = true;`
`87`	`92`	`}`
`88`	`93`	`}`