summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Czech <maczech@gmail.com>2023-08-08 11:42:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-08-08 11:42:55 +0000
commit23a926f14126721c61acae6a0f6c803942142ce4 (patch)
tree4610f26e60306d4f53d87e57d3a1e8c48ee04f7e
parentc566c0391eef1acb34e78ad272506fbcf2a87980 (diff)
parent5778c02f688d52d12d8603421cd08b1a84b0d199 (diff)
Merge "Avoid NullPointerException when deleting multiple tags" into stable-3.6
-rw-r--r--java/com/google/gerrit/server/restapi/project/DeleteRef.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/google/gerrit/server/restapi/project/DeleteRef.java b/java/com/google/gerrit/server/restapi/project/DeleteRef.java
index 5a84f69b62..73516b64f3 100644
--- a/java/com/google/gerrit/server/restapi/project/DeleteRef.java
+++ b/java/com/google/gerrit/server/restapi/project/DeleteRef.java
@@ -248,7 +248,7 @@ public class DeleteRef {
RefUpdate u = r.updateRef(refName);
u.setForceUpdate(true);
- u.setExpectedOldObjectId(r.exactRef(refName).getObjectId());
+ u.setExpectedOldObjectId(ref.getObjectId());
u.setNewObjectId(ObjectId.zeroId());
refDeletionValidator.validateRefOperation(
projectState.getName(),