opendev/gerrit
Code Issues Proposed changes

AccountIndexer: Do not fail if index is null

Browse Source 
Change-Id: I9e93b86524114be0f5acaa35d083009e675fc970
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-07-08 14:29:52 +02:00
parent 9a090100a2
commit f0e4f39463
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexer.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.index.account;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountState;
@@ -64,8 +65,12 @@ public class AccountIndexer {
}
private Collection<AccountIndex> getWriteIndexes() {
return indexes != null
? indexes.getWriteIndexes()
: Collections.singleton(index);
if (indexes != null) {
return indexes.getWriteIndexes();
}
return index != null
? Collections.singleton(index)
: ImmutableSet.<AccountIndex> of();
}
}