#87 more on streams

DICE-UNC · Jun 2, 2015 · 392a69e · 392a69e
1 parent 0924ace
commit 392a69e
Show file tree

Hide file tree

Showing 2 changed files with 225 additions and 211 deletions.
diff --git a/jargon-core/src/main/java/org/irods/jargon/core/pub/io/PackingIrodsOutputStream.java b/jargon-core/src/main/java/org/irods/jargon/core/pub/io/PackingIrodsOutputStream.java
@@ -16,14 +16,14 @@
  * an optimal buffer size before sending to iRODS
  * 
  * @author Mike Conway - DICE
- *
+ * 
  */
 public class PackingIrodsOutputStream extends OutputStream {
 
 	public final int BUFFER_SIZE = 4 * 1024 * 1024; // FIXME: make this a jargon
 													// props later
-	private int byteBufferSizeMax = 32 * 1024;
-	private int ptr = 0;
+	private final int byteBufferSizeMax = 32 * 1024;
+	private final int ptr = 0;
 	private ByteArrayOutputStream byteArrayOutputStream = null;
 	private final IRODSFileOutputStream irodsFileOutputStream;
 
@@ -65,12 +65,19 @@ public void write(byte[] b, int off, int len) throws IOException {
 			int lenToHoldOver = projectedLen - byteBufferSizeMax;
 			int lenToAddToBuff = len - lenToHoldOver;
 			byteArrayOutputStream.write(b, off, lenToAddToBuff);
-			irodsFileOutputStream
+			flushAndResetBufferStream();
 		}
 
 		super.write(b, off, len);
 	}
 
+	private void flushAndResetBufferStream() throws IOException {
+		irodsFileOutputStream.write(byteArrayOutputStream.toByteArray());
+		byteArrayOutputStream.reset();
+		ptr = 0;
+
+	}
+
 	/*
 	 * (non-Javadoc)
 	 *