From e01abbd543e28f3162b24ade5586a9644dedf4e8 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 28 Jun 2010 09:47:20 -0700 Subject: [PATCH] Release ObjectReader before the cached ObjectDatabase I don't want to play games with the order of release here, its probably safer to release the reader before the database, just in case the one depends on the other. Change-Id: I2394c7d2477eaf7a7e1556fc3393c59d3b31e764 Signed-off-by: Shawn O. Pearce --- .../src/org/eclipse/jgit/transport/IndexPack.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java index ade9ffed8..be82a2f5d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java @@ -424,13 +424,6 @@ public void index(final ProgressMonitor progress) throws IOException { writeIdx(); } finally { - try { - InflaterCache.release(inflater); - } finally { - inflater = null; - objectDatabase.close(); - } - try { if (readCurs != null) readCurs.release(); @@ -438,6 +431,13 @@ public void index(final ProgressMonitor progress) throws IOException { readCurs = null; } + try { + InflaterCache.release(inflater); + } finally { + inflater = null; + objectDatabase.close(); + } + progress.endTask(); if (packOut != null) packOut.close();