Ensure PackWriter releases its ObjectReader

Change-Id: I3f8af29066cc5a2132dc4a75c9654d97800f2f18
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java
index 031ea2b202d8c76e87c927229080b2112b36bed8..a716845b40e2380d127428760ec89091458e9338 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java
@@ -610,19 +610,22 @@ public class PackWriter {
         *             stream.
         */
        public void writePack(OutputStream packStream) throws IOException {
-               if ((reuseDeltas || reuseObjects) && reuseSupport != null)
-                       searchForReuse();
-
-               out = new PackOutputStream(packStream, isDeltaBaseAsOffset());
-
-               writeMonitor.beginTask(WRITING_OBJECTS_PROGRESS, getObjectsNumber());
-               out.writeFileHeader(PACK_VERSION_GENERATED, getObjectsNumber());
-               writeObjects();
-               writeChecksum();
-
-               out = null;
-               reader.release();
-               writeMonitor.endTask();
+               try {
+                       if ((reuseDeltas || reuseObjects) && reuseSupport != null)
+                               searchForReuse();
+
+                       out = new PackOutputStream(packStream, isDeltaBaseAsOffset());
+
+                       int cnt = getObjectsNumber();
+                       writeMonitor.beginTask(WRITING_OBJECTS_PROGRESS, cnt);
+                       out.writeFileHeader(PACK_VERSION_GENERATED, cnt);
+                       writeObjects();
+                       writeChecksum();
+                       writeMonitor.endTask();
+               } finally {
+                       out = null;
+                       reader.release();
+               }
        }
 
        private void searchForReuse() throws IOException {