commit 756cb5bac15b6576bdd7b7e011d5b0352d52769b
author David Pursehouse <dpursehouse@collab.net> Wed Sep 14 17:05:26 2016 +0200
committer Hugo Arès <hugo.ares@ericsson.com> Wed Sep 14 18:52:06 2016 +0000
tree 28c50d0bbdc469ab39acb0a9acb3b6ed8bde68fb
parent 437a1306405e81246aeb8a569cbba2c4b01784a3

WebLinks: Prevent NPE when file history weblink is null

Change-Id: Ib10ae08934bc517b05eb598da428b2085ef4d0b5

gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
index 6057f81..761f2a3 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
@@ -159,6 +159,9 @@
             WebLinkInfo info =
                 ((FileHistoryWebLink) webLink).getFileHistoryWebLink(project,
                     revision, file);
+            if (info == null) {
+              return null;
+            }
             WebLinkInfoCommon commonInfo = new WebLinkInfoCommon();
             commonInfo.name = info.name;
             commonInfo.imageUrl = info.imageUrl;