From 6a9e513b7bf44a9139999a570b329e88fb85e793 Mon Sep 17 00:00:00 2001
From: Edwin Kempin <ekempin@google.com>
Date: Thu, 12 Oct 2017 09:47:10 +0200
Subject: [PATCH] DeleteWatchedProjects: Ignore null values from input list

Bug: Issue 7403
Change-Id: I26c24c1d6131ee68f06414247bc789a1ac1e1065
Signed-off-by: Edwin Kempin <ekempin@google.com>
---
 .../com/google/gerrit/server/account/DeleteWatchedProjects.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java
index 1666eb10f0..ffb405c420 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java
@@ -34,6 +34,7 @@ import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 
 @Singleton
@@ -72,6 +73,7 @@ public class DeleteWatchedProjects
         accountId,
         input
             .stream()
+            .filter(Objects::nonNull)
             .map(w -> ProjectWatchKey.create(new Project.NameKey(w.project), w.filter))
             .collect(toList()));
     accountCache.evict(accountId);