ObjectDirectory: Clean up logging

Externalize the message and log the pack file with absolute path.

Change-Id: I019052dfae8fd96ab67da08b3287d699287004cb
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
(cherry picked from commit 9665d86ba1dd2937ca26f6aba63bb16aa277f888)

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 51a0ca971eb3df1284fcfd07a041889d1d0018ad..d29151b37b45243815b76167ebd41ff990aa1dff 100644 (file)
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -689,6 +689,7 @@ truncatedHunkOldLinesMissing=Truncated hunk, at least {0} old lines is missing
 tSizeMustBeGreaterOrEqual1=tSize must be >= 1
 unableToCheckConnectivity=Unable to check connectivity.
 unableToCreateNewObject=Unable to create new object: {0}
+unableToReadPackfile=Unable to read packfile {0}
 unableToRemovePath=Unable to remove path ''{0}''
 unableToStore=Unable to store {0}.
 unableToWrite=Unable to write {0}

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index 67fca5e85cc231695f0d4acb03440be5b212b862..2fc5501f48c66e414b3ad4bd94f1872077176ba1 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -748,6 +748,7 @@ public class JGitText extends TranslationBundle {
        /***/ public String tSizeMustBeGreaterOrEqual1;
        /***/ public String unableToCheckConnectivity;
        /***/ public String unableToCreateNewObject;
+       /***/ public String unableToReadPackfile;
        /***/ public String unableToRemovePath;
        /***/ public String unableToStore;
        /***/ public String unableToWrite;

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
index 6b8ef3a1bb05acb6b873edbc129d461557c22ff7..e953bbe30f9a52153229c28bf05de2b1ce5cee93 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
@@ -355,7 +355,9 @@ public class ObjectDirectory extends FileObjectDatabase {
                                        // The hasObject call should have only touched the index,
                                        // so any failure here indicates the index is unreadable
                                        // by this process, and the pack is likewise not readable.
-                                       LOG.warn("Unable to read packfile " + p.getPackFile(), e);
+                                       LOG.warn(MessageFormat.format(
+                                                       JGitText.get().unableToReadPackfile,
+                                                       p.getPackFile().getAbsolutePath()), e);
                                        removePack(p);
                                }
                        }
@@ -648,7 +650,8 @@ public class ObjectDirectory extends FileObjectDatabase {
                if ((e instanceof CorruptObjectException)
                                || (e instanceof PackInvalidException)) {
                        warnTmpl = JGitText.get().corruptPack;
-                       LOG.warn("Packfile " + p.getPackFile() + " is corrupted", e);
+                       LOG.warn(MessageFormat.format(warnTmpl,
+                                       p.getPackFile().getAbsolutePath()), e);
                        // Assume the pack is corrupted, and remove it from the list.
                        removePack(p);
                } else if (e instanceof FileNotFoundException) {