Update SearchEvent.java

Fix NPE on disabled local SolrIndex, occuring on search moving to the 2nd result page.
The debug purpose only setting to disabeling local SolrIndex (System Admin -> Debug Settings) should long term probably be removed from production code.
pull/110/head
Burkhard 8 years ago committed by GitHub
parent cdc7f3e431
commit 4fdc11cae8

@ -1567,7 +1567,7 @@ public final class SearchEvent {
log.warn("Wait for local solr search was interrupted.");
}
}
if (item >= this.localsolroffset && this.local_solr_stored.get() == 0 && this.localsolrsearch.isAlive()) {
if (item >= this.localsolroffset && this.local_solr_stored.get() == 0 && (this.localsolrsearch != null && this.localsolrsearch.isAlive())) {
try {
this.localsolrsearch.join();
} catch (final InterruptedException e) {

Loading…
Cancel
Save