Merge branch 'stable-2.15'
* stable-2.15:
ChangeRebuilderImpl#execute: Fix string formatting of exception message
ChangeRebuilderImpl#checkNoteDbState: Fix usage of String.format
Change-Id: Ica8e229ea756693b46eb0843761fe98c0a8027f1
diff --git a/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java b/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java
index ab2203e..9fa1edc 100644
--- a/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java
+++ b/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java
@@ -230,8 +230,9 @@
String newNoteDbStateStr = change.getNoteDbState();
if (newNoteDbStateStr == null) {
throw new OrmException(
- "Rebuilding change %s produced no writes to NoteDb: "
- + bundleReader.fromReviewDb(db, changeId));
+ String.format(
+ "Rebuilding change %s produced no writes to NoteDb: %s",
+ changeId, bundleReader.fromReviewDb(db, changeId)));
}
NoteDbChangeState newNoteDbState =
checkNotNull(NoteDbChangeState.parse(changeId, newNoteDbStateStr));
@@ -290,8 +291,7 @@
// Can only rebuild a change if its primary storage is ReviewDb.
NoteDbChangeState s = NoteDbChangeState.parse(c);
if (s != null && s.getPrimaryStorage() != PrimaryStorage.REVIEW_DB) {
- throw new OrmException(
- String.format("cannot rebuild change " + c.getId() + " with state " + s));
+ throw new OrmException(String.format("cannot rebuild change %s with state %s", c.getId(), s));
}
return c;
}
