From b9e485661dd0ecad67585ed0e24cb0ab025085a7 Mon Sep 17 00:00:00 2001 From: Colby Ranger Date: Mon, 3 Dec 2012 12:23:14 -0800 Subject: [PATCH] Fix DeltaWindow.clear() to release loaded buffer bytes. It is possible for the buffer to be set but not the index. It ocurrs when an exception occurs during creating an index, but after the buffer is loaded. Furthermore, the cleared DeltaWindowEntry should have been ent and not res. Change-Id: I2e0d79540316635bf7aa43efd225e4eb38230844 --- .../src/org/eclipse/jgit/storage/pack/DeltaWindow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/DeltaWindow.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/DeltaWindow.java index fead2147b..c51cafcbf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/DeltaWindow.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/DeltaWindow.java @@ -167,7 +167,7 @@ private static long estimateSize(ObjectToPack ent) { private void clear(DeltaWindowEntry ent) { if (ent.index != null) loaded -= ent.index.getIndexSize(); - else if (res.buffer != null) + else if (ent.buffer != null) loaded -= ent.buffer.length; ent.set(null); }