opendev/gerrit
Code Issues Proposed changes

BatchUpdate: Remove unneeded exception message building

Browse Source 
Since [1] which is included in recent upgrade of JGit, the toString
method in BatchRefUpdate includes both the command result and message
in the output.

Remove the now redundant construction of the same content, and instead
just let BatchRefUpdate@toString do it.

[1] https://git.eclipse.org/r/#/c/74430/

Change-Id: I3077b1e906c19fa8713ef98c589315d1e5c88d07
This commit is contained in:
David Pursehouse
2016-07-28 20:24:37 +09:00
parent b6a6c0ba4a
commit 8f01937079
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-server/src/main/java/com/google/gerrit/server/git/BatchUpdate.java
View File

@@ -812,21 +812,7 @@ public class BatchUpdate implements AutoCloseable {
bru.execute(rw, NullProgressMonitor.INSTANCE);
for (ReceiveCommand cmd : bru.getCommands()) {
if (cmd.getResult() != ReceiveCommand.Result.OK) {
// TODO(dborowitz): Not necessary once JGit is updated to include
// ba8eb931734d990c5a6a9352e4629fc84a191808.
StringBuilder sb = new StringBuilder("Update failed: [\n");
for (ReceiveCommand cmd2 : bru.getCommands()) {
sb.append(" ")
.append(cmd2)
.append(" (")
.append(cmd2.getResult())
.append(')');
if (cmd2.getMessage() != null) {
sb.append(": ").append(cmd2.getMessage());
}
sb.append('\n');
}
throw new IOException(sb.append(']').toString());
throw new IOException("Update failed: " + bru);
}
}
}