Skip to content

Commit edf23c7

Browse files
tarzanekvladak
authored andcommitted
cosmetic null safety for new reading of docs
1 parent 5925409 commit edf23c7

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -420,21 +420,23 @@ public void results(int start, int end, List<Hit> ret) {
420420
Level.WARNING, SEARCH_EXCEPTION_MSG, e);
421421
}
422422
hits = collector.topDocs().scoreDocs;
423-
Document d = null;
424423
StoredFields storedFields = null;
425424
try {
426425
storedFields = searcher.storedFields();
427426
} catch (Exception e) {
428427
LOGGER.log(
429428
Level.WARNING, SEARCH_EXCEPTION_MSG, e);
430429
}
431-
for (ScoreDoc hit : hits) {
432-
try {
433-
d = storedFields.document(hit.doc);
434-
docs.add(d);
435-
} catch (Exception e) {
436-
LOGGER.log(
437-
Level.SEVERE, SEARCH_EXCEPTION_MSG, e);
430+
if (storedFields != null) {
431+
Document d;
432+
for (ScoreDoc hit : hits) {
433+
try {
434+
d = storedFields.document(hit.doc);
435+
docs.add(d);
436+
} catch (Exception e) {
437+
LOGGER.log(
438+
Level.SEVERE, SEARCH_EXCEPTION_MSG, e);
439+
}
438440
}
439441
}
440442
allCollected = true;

0 commit comments

Comments
 (0)