DevServer: Add non-null value to GitilesServlet call That parameter was added through commit fbe16e86, which forgot to fix this change case accordingly. Make that parameter not @Nullable anymore, as calling that constructor with a null value caused an unrecoverable NPE for this change. This makes run_dev.sh [1] and the dev build target ([2]) working again. [1] Documentation/developer-guide.md [2] bazel build java/com/google/gitiles/dev Change-Id: I45c65c5debad8fc0a50252cc530d8e84e712db4a
diff --git a/java/com/google/gitiles/GitilesFilter.java b/java/com/google/gitiles/GitilesFilter.java index 8876007..b347e08 100644 --- a/java/com/google/gitiles/GitilesFilter.java +++ b/java/com/google/gitiles/GitilesFilter.java
@@ -191,7 +191,7 @@ @Nullable TimeCache timeCache, @Nullable BlameCache blameCache, @Nullable GitwebRedirectFilter gitwebRedirect, - @Nullable BranchRedirectFilter branchRedirect, + BranchRedirectFilter branchRedirect, @Nullable Filter errorHandler) { this.config = checkNotNull(config, "config"); this.renderer = renderer;
diff --git a/java/com/google/gitiles/GitilesServlet.java b/java/com/google/gitiles/GitilesServlet.java index df2c3da..4467cfa 100644 --- a/java/com/google/gitiles/GitilesServlet.java +++ b/java/com/google/gitiles/GitilesServlet.java
@@ -52,7 +52,7 @@ @Nullable TimeCache timeCache, @Nullable BlameCache blameCache, @Nullable GitwebRedirectFilter gitwebRedirect, - @Nullable BranchRedirectFilter branchRedirect) { + BranchRedirectFilter branchRedirect) { this( config, renderer, @@ -77,7 +77,7 @@ @Nullable TimeCache timeCache, @Nullable BlameCache blameCache, @Nullable GitwebRedirectFilter gitwebRedirect, - @Nullable BranchRedirectFilter branchRedirect, + BranchRedirectFilter branchRedirect, @Nullable Filter errorHandler) { super( new GitilesFilter(
diff --git a/java/com/google/gitiles/dev/DevServer.java b/java/com/google/gitiles/dev/DevServer.java index 29414c4..5a8fed5 100644 --- a/java/com/google/gitiles/dev/DevServer.java +++ b/java/com/google/gitiles/dev/DevServer.java
@@ -19,6 +19,7 @@ import com.google.common.base.Strings; import com.google.common.html.types.UncheckedConversions; +import com.google.gitiles.BranchRedirectFilter; import com.google.gitiles.DebugRenderer; import com.google.gitiles.GitilesAccess; import com.google.gitiles.GitilesServlet; @@ -137,7 +138,9 @@ if (!Strings.isNullOrEmpty(docRoot)) { servlet = createRootedDocServlet(renderer, docRoot); } else { - servlet = new GitilesServlet(cfg, renderer, null, null, null, null, null, null, null); + servlet = + new GitilesServlet( + cfg, renderer, null, null, null, null, null, null, null, new BranchRedirectFilter()); } ServletContextHandler handler = new ServletContextHandler();