Merge "ChangeInserter: fix comparison of Change.Id to Change.Key" into stable-2.9

gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
index ce6bf4c..0da8803 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -214,8 +214,12 @@
   }
 
   private boolean messageIsForChange() {
-    return changeMessage != null
-        && changeMessage.getKey().getParentKey().equals(change.getKey());
+    if (changeMessage == null) {
+      return false;
+    }
+    Change.Id id = change.getId();
+    Change.Id msgId = changeMessage.getKey().getParentKey();
+    return msgId.equals(id);
   }
 
   private void insertMessage(ReviewDb db) throws OrmException {