commit d7e39642eb8a3cc5e3644fa81d7f7997b38461a0
author Edwin Kempin <edwin.kempin@sap.com> Mon Apr 27 12:59:06 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 27 12:59:07 2015 +0000
tree 4b1af16c74685d666691a9fd56459708706b04db
parent 4ac7bbc3cb971c9245e3d99cf5a07dada326af84
parent fbde161020c9096143431e0d166ba8fe3f01c286

Merge "Skip replay inline comments for revisions that do not exist in source" into stable-2.11

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayInlineCommentsStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayInlineCommentsStep.java
index 7ce0212..ec85a3a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayInlineCommentsStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayInlineCommentsStep.java
@@ -125,6 +125,14 @@
         }
 
         comments = filterComments(ps, comments);
+      } else if (comments == null) {
+        log.warn(String.format(
+            "[%s] Cannot retrieve comments for revision %s, "
+                + "revision not found in source system: "
+                + "Skip replay inline comments for patch set %s of project %s.",
+            pluginName, ps.getRevision().get(), ps.getId().toString(),
+            change.getProject().get()));
+        continue;
       }
 
       Multimap<Account.Id, CommentInfo> commentsByAuthor = ArrayListMultimap.create();