MultiPackIndexLoader: report what chunk is going over size The message is misleading because what is too big is a specific chunk, not the whole index. Use a better message that is more explicit and tells what chunk is oversized and how big it is. Change-Id: Ibd6fa3388c11e099eaa79349ae2bcdc46a6a6964
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 8889d75..5dedccd 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -512,6 +512,7 @@ messageAndTaggerNotAllowedInUnannotatedTags = Unannotated tags cannot have a message or tagger midxChunkNeeded=midx 0x{0} chunk has not been loaded midxChunkRepeated=midx chunk id 0x{0} appears multiple times +midxChunkTooBig=chunk 0x{0} is too big (%d bytes) midxChunkUnknown=unknown midx chunk: 0x{0} minutesAgo={0} minutes ago mismatchOffset=mismatch offset for object {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 1f49629..db4a4e2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -543,6 +543,7 @@ public static JGitText get() { /***/ public String messageAndTaggerNotAllowedInUnannotatedTags; /***/ public String midxChunkNeeded; /***/ public String midxChunkRepeated; + /***/ public String midxChunkTooBig; /***/ public String midxChunkUnknown; /***/ public String minutesAgo; /***/ public String mismatchOffset;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoader.java index 4b70c2c..a3cb115 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoader.java
@@ -162,7 +162,8 @@ public static MultiPackIndex read(InputStream fd) if (len > Integer.MAX_VALUE - 8) { // http://stackoverflow.com/a/8381338 throw new MultiPackIndexFormatException( - JGitText.get().multiPackIndexFileIsTooLargeForJgit); + MessageFormat.format(JGitText.get().midxChunkTooBig, + chunkId, len)); } byte[] buffer = new byte[(int) len];