diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2016-09-21 18:08:00 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-09-21 18:08:00 +0200 |
| commit | 1b11f4fddaf5f781663fd13ea5621189b82db5be (patch) | |
| tree | 0194725a2bcecd333dd55166a314cdbe174073bf /org.eclipse.jgit | |
| parent | 6cd6ccb65a9952e8f6c802fa8b93026645df01dd (diff) | |
| parent | c10a7e7931473f197ae30669840942413db6b6cd (diff) | |
| download | jgit-1b11f4fddaf5f781663fd13ea5621189b82db5be.tar.gz jgit-1b11f4fddaf5f781663fd13ea5621189b82db5be.zip | |
Merge branch 'stable-4.5'
* stable-4.5:
Turn off doclint also during Maven site generation
Prepare 4.5.1-SNAPSHOT builds
JGit v4.5.0.201609210915-r
Unconditionally close repository in unregisterAndCloseRepository
Change-Id: Ibfd11669cd74d2e62b014c18fd39b646b200c8c5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java | 8 |
1 files changed, 3 insertions, 5 deletions
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 29ef084830..2e0ed16a55 100644 --- 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(); } } } |