motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix the parameters to an exception 

A parenthesis was in the wrong place passing arguments to the wrong
format call. Also fix formatting of enclosing switch statement.

Change-Id: I4cb9642f08b58c39033c3a81dab4bd56bebf4fd2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Robin Rosenberg 2013-05-08 23:52:52 +02:00 committed by Matthias Sohn
parent 4800ac50f9
commit a62770a3dd
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
View File

@ -615,26 +615,25 @@ private Set<ObjectId> listNonHEADIndexObjects()
while (treeWalk.next()) {
ObjectId objectId = treeWalk.getObjectId(0);
switch (treeWalk.getRawMode(0) & FileMode.TYPE_MASK) {
case FileMode.TYPE_MISSING:
case FileMode.TYPE_GITLINK:
continue;
case FileMode.TYPE_TREE:
case FileMode.TYPE_FILE:
case FileMode.TYPE_SYMLINK:
ret.add(objectId);
continue;
default:
switch (treeWalk.getRawMode(0) & FileMode.TYPE_MASK) {
case FileMode.TYPE_MISSING:
case FileMode.TYPE_GITLINK:
continue;
case FileMode.TYPE_TREE:
case FileMode.TYPE_FILE:
case FileMode.TYPE_SYMLINK:
ret.add(objectId);
continue;
default:
throw new IOException(MessageFormat.format(
JGitText.get().corruptObjectInvalidMode3, String
.format("%o", Integer.valueOf(treeWalk //$NON-NLS-1$
.getRawMode(0)),
(objectId == null) ? "null" //$NON-NLS-1$
: objectId.name(), treeWalk
.getPathString(), repo
.getIndexFile())));
}
}
JGitText.get().corruptObjectInvalidMode3,
String.format("%o", //$NON-NLS-1$
Integer.valueOf(treeWalk.getRawMode(0))),
(objectId == null) ? "null" : objectId.name(), //$NON-NLS-1$
treeWalk.getPathString(), //
repo.getIndexFile()));
}
}
return ret;
} finally {
if (revWalk != null)
@ -703,7 +702,6 @@ public int compare(PackExt o1, PackExt o2) {
}
// write the packindex
@SuppressWarnings("resource")
FileChannel idxChannel = new FileOutputStream(tmpIdx).getChannel();
OutputStream idxStream = Channels.newOutputStream(idxChannel);
try {