honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use consistent check whether or not timeout is set

This commit is contained in:
Jason Tedor 2015-07-28 15:44:55 -04:00
parent d8a6ddf580
commit 37177d2f4c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
View File

@ -176,7 +176,7 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable {
@Override @Override
public void search(List<LeafReaderContext> leaves, Weight weight, Collector collector) throws IOException { public void search(List<LeafReaderContext> leaves, Weight weight, Collector collector) throws IOException {
final boolean timeoutSet = searchContext.timeoutInMillis() != -1; final boolean timeoutSet = searchContext.timeoutInMillis() != SearchService.NO_TIMEOUT.millis();
final boolean terminateAfterSet = searchContext.terminateAfter() != SearchContext.DEFAULT_TERMINATE_AFTER; final boolean terminateAfterSet = searchContext.terminateAfter() != SearchContext.DEFAULT_TERMINATE_AFTER;
try { try {
if (timeoutSet || terminateAfterSet) { if (timeoutSet || terminateAfterSet) {