You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by fo...@apache.org on 2020/06/25 15:09:38 UTC

svn commit: r1879191 - /jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java

Author: fortino
Date: Thu Jun 25 15:09:37 2020
New Revision: 1879191

URL: http://svn.apache.org/viewvc?rev=1879191&view=rev
Log:
OAK-9120: oak-search-elastic: fix possible issue in async iterator

Modified:
    jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java

Modified: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java?rev=1879191&r1=1879190&r2=1879191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java Thu Jun 25 15:09:37 2020
@@ -116,7 +116,12 @@ public class ElasticResultRowAsyncIterat
                 return null;
             }
         }
-        return nextRow != null && POISON_PILL.path.equals(nextRow.path) ? null : nextRow;
+        FulltextResultRow row = null;
+        if (nextRow != null && !POISON_PILL.path.equals(nextRow.path)) {
+            row = nextRow;
+            nextRow = null;
+        }
+        return row;
     }
 
     @Override