commit 17d5f1f8e21a35434b94d81f1c61d78955edd04e
author David Pursehouse <david.pursehouse@sonymobile.com> Sun May 01 06:15:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun May 01 06:15:36 2016 +0000
tree eaa4c5a51167f89ad0c58ca78f77be73f0d2b91a
parent eb44c0e18b2b834b9e014875ef4e374080448f45
parent 3d35012d512a8d54382848379b798027f9b0ceda

Merge "Fix "Failed to reindex changes"" into stable-2.11

gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
index 38382aa..8947a38 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
@@ -140,7 +140,8 @@
 
   String getRemoteUser(HttpServletRequest req) {
     String remoteUser = RemoteUserUtil.getRemoteUser(req, loginHeader);
-    return userNameToLowerCase ? remoteUser.toLowerCase(Locale.US) : remoteUser;
+    return (userNameToLowerCase && remoteUser != null) ?
+        remoteUser.toLowerCase(Locale.US) : remoteUser;
   }
 
   String getRemoteDisplayname(HttpServletRequest req) {