Unconditionally close repository in unregisterAndCloseRepository

Repository.close() method is used when reference counting and expiration
needs to be honored. The RepositoryCache.unregisterAndCloseRepository
method should close the repository unconditionally. This is also indicated
from its javadoc.

Change-Id: I19392d1eaa17f27ae44b55eea49dcff05a52f298

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
index 29ef08483096211572ddcc3ed708ff4c9b2c96a2..2e0ed16a553ac99460dcd7e4f0e3b4fd71521563 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
@@ -305,11 +305,9 @@ public class RepositoryCache {
        private void unregisterAndCloseRepository(final Key location,
                        Repository db) {
                synchronized (lockFor(location)) {
-                       if (isExpired(db)) {
-                               Repository oldDb = unregisterRepository(location);
-                               if (oldDb != null) {
-                                       oldDb.close();
-                               }
+                       Repository oldDb = unregisterRepository(location);
+                       if (oldDb != null) {
+                               oldDb.doClose();
                        }
                }
        }