diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java index 914930c9a6..3bc3a58ab6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java @@ -24,9 +24,13 @@ import com.google.gerrit.server.CommentsUtil; import com.google.gerrit.server.notedb.ChangeDraftUpdate; import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.patch.PatchListCache; -import com.google.gwtorm.server.OrmException; +import com.google.gerrit.server.patch.PatchListNotAvailableException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class DraftCommentEvent extends Event { + private static final Logger log = LoggerFactory.getLogger(DraftCommentEvent.class); + public final Comment c; private final Change change; private final PatchSet ps; @@ -56,9 +60,18 @@ class DraftCommentEvent extends Event { throw new UnsupportedOperationException(); } - void applyDraft(ChangeDraftUpdate draftUpdate) throws OrmException { + void applyDraft(ChangeDraftUpdate draftUpdate) { if (c.revId == null) { - setCommentRevId(c, cache, change, ps); + try { + setCommentRevId(c, cache, change, ps); + } catch (PatchListNotAvailableException e) { + log.warn( + "Unable to determine parent commit of patch set {} ({}); omitting draft inline comment", + ps.getId(), + ps.getRevision(), + c); + return; + } } draftUpdate.putComment(c); } |