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

Posted to commits@jackrabbit.apache.org by un...@apache.org on 2012/12/13 21:06:40 UTC

svn commit: r1421478 - /jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java

Author: unico
Date: Thu Dec 13 20:06:39 2012
New Revision: 1421478

URL: http://svn.apache.org/viewvc?rev=1421478&view=rev
Log:
JCR-3483 nullify current node element before session is alive check is made

Modified:
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java?rev=1421478&r1=1421477&r2=1421478&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java Thu Dec 13 20:06:39 2012
@@ -179,6 +179,7 @@ class NodeIteratorImpl implements NodeIt
      */
     protected void fetchNext() {
         try {
+            next = null; // reset
             sessionContext.getSessionState().perform(new FetchNext());
         } catch (RepositoryException e) {
             log.warn("Failed to fetch next node", e);
@@ -188,7 +189,6 @@ class NodeIteratorImpl implements NodeIt
     private class FetchNext implements SessionOperation<Object> {
 
         public Object perform(SessionContext context) {
-            next = null; // reset
 
             ItemManager itemMgr = context.getItemManager();
             while (next == null && scoreNodes.hasNext()) {