commit 277cf8c10bafe0f81807f3af29eb607cee7266b6
author Sasa Zivkov <sasa.zivkov@sap.com> Wed Apr 15 13:24:43 2015 +0200
committer Gerrit Code Review <gerrit@git.wdf.sap.corp> Wed Apr 15 13:24:43 2015 +0200
tree 6cf47936036fb3c0dda602bf22894b4d65ad87f5
parent c67548ff345b1544e5abfc06f682560ad0447890
parent 1da850be90283b6215fa3f4d9006d1b115a56d9a

Merge "Write error log with change ID when replaying a change fails"

src/main/java/com/googlesource/gerrit/plugins/importer/ReplayMessagesStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayMessagesStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayMessagesStep.java
index 5f2d92c..306d819 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayMessagesStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayMessagesStep.java
@@ -87,9 +87,10 @@
       if (msg.author != null) {
         Account.Id userId = accountUtil.resolveUser(api, msg.author);
         ChangeUpdate update = updateFactory.create(control(change, userId), ts);
-        ChangeMessage cmsg =
-            new ChangeMessage(msgKey, userId, ts, new PatchSet.Id(
-                change.getId(), msg._revisionNumber));
+        PatchSet.Id psId = msg._revisionNumber != null
+            ? new PatchSet.Id(change.getId(),  msg._revisionNumber)
+            : null;
+        ChangeMessage cmsg = new ChangeMessage(msgKey, userId, ts, psId);
         cmsg.setMessage(msg.message);
         cmUtil.addChangeMessage(db, update, cmsg);
         update.commit();