From 03f78fc3bc0c60e589c98d56830ffa5ba1eacd7e Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 25 Feb 2011 17:20:14 -0800 Subject: [PATCH] UnpackedObject: Fix readSome() when initial read is short JDK7 changed behavior slightly on some InputStream types, resulting in the first read being shorter than the count requested. That caused us to overwrite the earlier part of the buffer with later data, as the offset index wasn't updated in the loop. Fix the loop to increment offset by the number of bytes read in this iteration, so the next read appends to the buffer rather than doing an overwrite. Bug: 338119 Change-Id: I222fb2f993cd9b637b6b8d93daab5777ef7ec7a6 Signed-off-by: Shawn O. Pearce --- .../src/org/eclipse/jgit/storage/file/UnpackedObject.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/UnpackedObject.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/UnpackedObject.java index 4065019dc..b04a294b6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/UnpackedObject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/UnpackedObject.java @@ -328,6 +328,7 @@ public class UnpackedObject { if (n < 0) break; avail += n; + off += n; cnt -= n; } return avail;