commit bdfe4c47c4c71fd48305cd3450826e327fe77bd1
author David Pursehouse <dpursehouse@collab.net> Wed Sep 19 23:25:17 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 19 23:25:17 2018 +0000
tree 7f2231d93617dd0486ae43a14ae2450c9afda0f0
parent cd6efc34da4a33d414543926d4e7b3c9d55df3a4
parent 5abc0f09626d24c2eeb131b35c82dd8687ec8a6a

Merge "IndexServlet: Add Nullable annotation for canonicalWebUrl parameters"

java/com/google/gerrit/httpd/raw/IndexServlet.java

diff --git a/java/com/google/gerrit/httpd/raw/IndexServlet.java b/java/com/google/gerrit/httpd/raw/IndexServlet.java
index 90b25d9..a414e84 100644
--- a/java/com/google/gerrit/httpd/raw/IndexServlet.java
+++ b/java/com/google/gerrit/httpd/raw/IndexServlet.java
@@ -37,7 +37,8 @@
   private static final long serialVersionUID = 1L;
   protected final byte[] indexSource;
 
-  IndexServlet(String canonicalURL, @Nullable String cdnPath, @Nullable String faviconPath)
+  IndexServlet(
+      @Nullable String canonicalURL, @Nullable String cdnPath, @Nullable String faviconPath)
       throws URISyntaxException {
     String resourcePath = "com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy";
     SoyFileSet.Builder builder = SoyFileSet.builder();
@@ -62,7 +63,7 @@
     }
   }
 
-  static String computeCanonicalPath(String canonicalURL) throws URISyntaxException {
+  static String computeCanonicalPath(@Nullable String canonicalURL) throws URISyntaxException {
     if (Strings.isNullOrEmpty(canonicalURL)) {
       return "";
     }