regression on toBuffer() #1250

Author: ehennum

marklogic-client-api/src/main/java/com/marklogic/client/io/InputStreamHandle.java

@@ -109,6 +109,9 @@ public InputStreamHandle(InputStream content) {
    */
   @Override
   public InputStream get() {
+    if (contentBytes != null) {
+      return new ByteArrayInputStream(contentBytes);
+    }
     return content;
   }
   /**
@@ -177,6 +180,7 @@ public void fromBuffer(byte[] buffer) {
   public byte[] toBuffer() {
     if (contentBytes == null && content != null) {
       contentBytes = contentToBytes(get());
+      content = null;
     }
     return contentBytes;
   }
@@ -231,25 +235,29 @@ protected void receiveContent(InputStream content) {
   }
   @Override
   protected InputStream sendContent() {
-    if (content == null) {
+    InputStream sendableContent = get();
+    if (sendableContent == null) {
       throw new IllegalStateException("No stream to write");
     }
 
-    return content;
+    return sendableContent;
   }
 
   /** Either call close() or get().close() when finished with this handle to close the underlying InputStream.
    */
   @Override
   public void close() {
+    if (contentBytes != null) {
+      contentBytes = null;
+    }
     if (content != null) {
       try {
         content.close();
       } catch (IOException e) {
         logger.error("Failed to close underlying InputStream", e);
         throw new MarkLogicIOException(e);
       } finally {
-        set(null, null);
+        content = null;
       }
     }
   }