From: Shawn O. Pearce Date: Thu, 11 Dec 2008 04:58:38 GMT Subject: [JGIT PATCH 1/5] Add toByteArray() to TemporaryBuffer Message-ID: <1228971522-28764-2-git-send-email-spearce@spearce.org> In-Reply-To: <1228971522-28764-1-git-send-email-spearce@spearce.org> It can be more useful to convert a buffered output stream into a single byte array, without paying the penalties associated with ByteArrayOutputStream to do the same action. Signed-off-by: Shawn O. Pearce --- .../src/org/spearce/jgit/util/TemporaryBuffer.java | 34 ++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/util/TemporaryBuffer.java b/org.spearce.jgit/src/org/spearce/jgit/util/TemporaryBuffer.java index d597c38..b1ffd6e 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/util/TemporaryBuffer.java +++ b/org.spearce.jgit/src/org/spearce/jgit/util/TemporaryBuffer.java @@ -182,6 +182,40 @@ public long length() { } /** + * Convert this buffer's contents into a contiguous byte array. + *

+ * The buffer is only complete after {@link #close()} has been invoked. + * + * @return the complete byte array; length matches {@link #length()}. + * @throws IOException + * an error occurred reading from a local temporary file + * @throws OutOfMemoryError + * the buffer cannot fit in memory + */ + public byte[] toByteArray() throws IOException { + final long len = length(); + if (Integer.MAX_VALUE < len) + throw new OutOfMemoryError("Length exceeds maximum array size"); + + final byte[] out = new byte[(int) len]; + if (blocks != null) { + int outPtr = 0; + for (final Block b : blocks) { + System.arraycopy(b.buffer, 0, out, outPtr, b.count); + outPtr += b.count; + } + } else { + final FileInputStream in = new FileInputStream(onDiskFile); + try { + NB.readFully(in, out, 0, (int) len); + } finally { + in.close(); + } + } + return out; + } + + /** * Send this buffer to an output stream. *

* This method may only be invoked after {@link #close()} has completed -- 1.6.1.rc2.299.gead4c