LuceneAccountIndex: Return results from read method
Change-Id: I77b20e9fcf66e5541f08711be1faca8c3891d9c2
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneAccountIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneAccountIndex.java
index bf326ff..78c0185 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneAccountIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneAccountIndex.java
@@ -53,6 +53,8 @@
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutionException;
@@ -165,6 +167,23 @@
Document doc = searcher.doc(sd.doc, fields(opts));
result.add(toAccountState(doc));
}
+ final List<AccountState> r = Collections.unmodifiableList(result);
+ return new ResultSet<AccountState>() {
+ @Override
+ public Iterator<AccountState> iterator() {
+ return r.iterator();
+ }
+
+ @Override
+ public List<AccountState> toList() {
+ return r;
+ }
+
+ @Override
+ public void close() {
+ // Do nothing.
+ }
+ };
} catch (IOException e) {
throw new OrmException(e);
} finally {
@@ -176,7 +195,6 @@
}
}
}
- return null;
}
}
