commit ceca592e8ed2870ee9b2e2c9e1b93c1f07f81ffa
author Taylor Santiago <taylorsantiago@google.com> Tue Jun 03 12:51:49 2025 -0700
committer Taylor Santiago <taylorsantiago@google.com> Tue Jun 03 12:52:27 2025 -0700
tree cf9d1f400021186b256d6ef397c86725a8785fa7
parent f7dc987ee3a2b73c911f717ee1c0d3d82a359869

Fix NullPointerException reported from Third Eye

Change-Id: I9acd0ef02aa1d659b6f166d27013d44a390c561d

src/main/java/com/googlesource/gerrit/plugins/automerger/CherryPickChangeCreator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/CherryPickChangeCreator.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/CherryPickChangeCreator.java
index 6eac9f6..c112ae8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/CherryPickChangeCreator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/CherryPickChangeCreator.java
@@ -149,8 +149,8 @@
     List<ChangeInfo> changes =
         ChangeUtils.getChangesInTopicAndBranch(gApi, currentTopic, sdsChangeInput.downstreamBranch);
     for (ChangeInfo change : changes) {
-      if(change.cherryPickOfChange.equals(sdsChangeInput.changeNumber)
-          && change.cherryPickOfPatchSet == sdsChangeInput.patchsetNumber) {
+      if(change.cherryPickOfChange != null && change.cherryPickOfChange.equals(sdsChangeInput.changeNumber)
+          && change.cherryPickOfPatchSet != null && change.cherryPickOfPatchSet.equals(sdsChangeInput.patchsetNumber)) {
         return true;
       }
     }