NoteDbUpdateManager: Log correct value on draft ref mismatch
Change-Id: Ifefbb8efc8dae78a4072f97dc0abbd738647af60
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
index 1e5cb1e..cb8f159 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
@@ -14,6 +14,7 @@
package com.google.gerrit.server.notedb;
+import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
@@ -551,11 +552,12 @@
Account.Id accountId = u.getAccountId();
if (!expectedState.areDraftsUpToDate(
allUsersRepo.cmds.getRepoRefCache(), accountId)) {
+ ObjectId expectedDraftId = firstNonNull(
+ expectedState.getDraftIds().get(accountId), ObjectId.zeroId());
throw new OrmConcurrencyException(String.format(
"cannot apply NoteDb updates for change %s;"
+ " draft ref for account %s does not match %s",
- u.getId(), accountId,
- expectedState.getChangeMetaId().name()));
+ u.getId(), accountId, expectedDraftId.name()));
}
}
}
