Repository: Include repository name when logging corrupt use count

Logging the repository name makes it easier to track down what is
incorrectly closing a repository.

Change-Id: I42a8bdf766c0e67f100adbf76d9616584e367ac2
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>

diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index eb6f3a0aae3d974a8754368544772de2f4ef4719..8bf2155d93f5427139181f8f5a69b86353f7d2ae 100644 (file)
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -188,7 +188,7 @@ corruptObjectTruncatedInMode=truncated in mode
 corruptObjectTruncatedInName=truncated in name
 corruptObjectTruncatedInObjectId=truncated in object id
 corruptObjectZeroId=entry points to null SHA-1
-corruptUseCnt=close() called when useCnt is already zero
+corruptUseCnt=close() called when useCnt is already zero for {0}
 couldNotCheckOutBecauseOfConflicts=Could not check out because of conflicts
 couldNotDeleteLockFileShouldNotHappen=Could not delete lock file. Should not happen
 couldNotDeleteTemporaryIndexFileShouldNotHappen=Could not delete temporary index file. Should not happen

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
index 641262cd50991b7ba2025d34a3de919623d166a4..6be97ffda6f1dd40ea0e4c3593c4993806ffb6dd 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
@@ -889,11 +889,12 @@ public abstract class Repository implements AutoCloseable {
                } else if (newCount == -1) {
                        // should not happen, only log when useCnt became negative to
                        // minimize number of log entries
+                       String message = MessageFormat.format(JGitText.get().corruptUseCnt,
+                                       toString());
                        if (LOG.isDebugEnabled()) {
-                               IllegalStateException e = new IllegalStateException();
-                               LOG.debug(JGitText.get().corruptUseCnt, e);
+                               LOG.debug(message, new IllegalStateException());
                        } else {
-                               LOG.warn(JGitText.get().corruptUseCnt);
+                               LOG.warn(message);
                        }
                        if (RepositoryCache.isCached(this)) {
                                closedAt.set(System.currentTimeMillis());