Do not close repository twice
RepositoryCache.close is also closing the repository after evicting it
from the cache, no need to call repository.close.
Before this change, the following warning was printed in the logs:
org.eclipse.jgit.lib.Repository : close() called when useCnt is already
zero for Repository ...
Change-Id: Ifb6d3d318d9140da4c241669446d68f5839c0b47
diff --git a/src/main/java/com/googlesource/gerrit/plugins/renameproject/fs/FilesystemRenameHandler.java b/src/main/java/com/googlesource/gerrit/plugins/renameproject/fs/FilesystemRenameHandler.java
index b2cb924..9663be4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/renameproject/fs/FilesystemRenameHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/renameproject/fs/FilesystemRenameHandler.java
@@ -49,7 +49,7 @@
throws IOException, RepositoryNotFoundException {
Repository repository = repoManager.openRepository(oldProjectKey);
File repoFile = repository.getDirectory();
- closeAndRemoveFromCache(repository);
+ RepositoryCache.close(repository);
pm.beginTask("Renaming git repository", ProgressMonitor.UNKNOWN);
renameGitRepository(repoFile, newProjectKey, oldProjectKey);
}
@@ -60,7 +60,7 @@
log.debug("Creating the new git repo - {}", newProjectKey.get());
try (Repository newRepo = repoManager.createRepository(newProjectKey)) {
File target = newRepo.getDirectory();
- closeAndRemoveFromCache(newRepo);
+ RepositoryCache.close(newRepo);
// delete the created repo, we just needed the absolute path from repo manager
recursiveDelete(target.toPath());
log.debug(
@@ -81,9 +81,4 @@
throw e;
}
}
-
- private void closeAndRemoveFromCache(Repository repository) {
- repository.close();
- RepositoryCache.close(repository);
- }
}
