ReplayMessagesStep: Fix potential NullPointerException
Change-Id: I86d5a79816f8570fd9fa7a3b9f68409ee4d13097
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 3fb9932..dde14ee 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayMessagesStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayMessagesStep.java
@@ -87,12 +87,12 @@
}
Timestamp ts = msg.date;
+ PatchSet.Id psId = msg._revisionNumber != null
+ ? new PatchSet.Id(change.getId(), msg._revisionNumber)
+ : null;
if (msg.author != null) {
Account.Id userId = accountUtil.resolveUser(api, msg.author);
ChangeUpdate update = updateFactory.create(control(change, userId), ts);
- 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);
@@ -101,7 +101,7 @@
// Message create by the GerritPersonIdent user
ChangeMessage cmsg =
new ChangeMessage(new ChangeMessage.Key(change.getId(), msg.id),
- null, ts, new PatchSet.Id(change.getId(), msg._revisionNumber));
+ null, ts, psId);
cmsg.setMessage(msg.message);
db.changeMessages().insert(Collections.singleton(cmsg));
}