From 838c29de74326319376b27d80e5da7e2d62cd6a1 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Fri, 18 Nov 2016 12:53:59 -0800 Subject: [PATCH] ChangeScreen: Expect that current revision can be null Change-Id: I9f15935bb11e07ac27d367e2bdb2d4e055c8263b Signed-off-by: Edwin Kempin --- .../java/com/google/gerrit/client/change/ChangeScreen.java | 3 ++- .../java/com/google/gerrit/client/change/RelatedChanges.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java index fa3855eff4..794425ed4d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java @@ -462,7 +462,8 @@ public class ChangeScreen extends Screen { } private void gotoSibling(int offset) { - if (offset > 0 && changeInfo.currentRevision().equals(revision)) { + if (offset > 0 && changeInfo.currentRevision() != null + && changeInfo.currentRevision().equals(revision)) { return; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java index 2d868da7de..0d0dba752e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java @@ -215,7 +215,8 @@ public class RelatedChanges extends TabPanel { EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT), new TabChangeListCallback(Tab.CHERRY_PICKS, info.project(), revision)); - if (info.currentRevision().equals(revision)) { + if (info.currentRevision() != null + && info.currentRevision().equals(revision)) { ChangeApi.change(info.legacyId().get()).view("submitted_together") .get(new TabChangeListCallback(Tab.SUBMITTED_TOGETHER, info.project(), revision));