commit 0a5d4632876a6c940db79d08119955d545c41744
author David Ostrovsky <david@ostrovsky.org> Sun Mar 20 20:34:58 2016 +0100
committer David Pursehouse <david.pursehouse@sonymobile.com> Tue Apr 19 05:02:20 2016 +0000
tree c77971d04c65fa1f1224f69e6aae4669405b8710
parent a3e684c61baf80efd1ebe6aa64039718f2c7f22b

AccountIndex: Fix username field

Change-Id: Ie05d36898b426cd52cb5b1e12c245b3651b44623

gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java
index 6da7eef..8627e3a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java
@@ -16,6 +16,7 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicates;
+import com.google.common.base.Strings;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Iterables;
 import com.google.gerrit.reviewdb.client.AccountExternalId;
@@ -128,10 +129,10 @@
 
   public static final FieldDef<AccountState, String> USERNAME =
       new FieldDef.Single<AccountState, String>(
-            "username", null, false) {
+            "username", FieldType.EXACT, false) {
         @Override
         public String get(AccountState input, FillArgs args) {
-          return input.getUserName().toLowerCase();
+          return Strings.nullToEmpty(input.getUserName()).toLowerCase();
         }
       };