diff options
author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2010-04-24 08:19:01 -0400 |
---|---|---|
committer | Code Review <codereview-daemon@eclipse.org> | 2010-04-24 08:19:01 -0400 |
commit | 4ef96296f7cbd748cf46a6c6fba045e355915158 (patch) | |
tree | 4df5c4f7b809169bede31e9024c3fd743837a5af | |
parent | f36df5dc6a848bfe6d094c46801545980492dcd7 (diff) | |
parent | dafa8fbff42be3c644061fa6c81d149097bd31fd (diff) | |
download | jgit-4ef96296f7cbd748cf46a6c6fba045e355915158.tar.gz jgit-4ef96296f7cbd748cf46a6c6fba045e355915158.zip |
Merge "Fix NPE during InflaterCache return after corrupt loose object"
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/UnpackedObjectLoader.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/UnpackedObjectLoader.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/UnpackedObjectLoader.java index 968dada0cd..005df4b98d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/UnpackedObjectLoader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/UnpackedObjectLoader.java @@ -120,7 +120,6 @@ public class UnpackedObjectLoader extends ObjectLoader { final CorruptObjectException coe; coe = new CorruptObjectException(id, "bad stream"); coe.initCause(dfe); - inflater.end(); throw coe; } if (avail < 5) |