Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A2E84D26E for ; Thu, 13 Dec 2012 20:06:16 +0000 (UTC) Received: (qmail 27366 invoked by uid 500); 13 Dec 2012 20:06:16 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 27335 invoked by uid 500); 13 Dec 2012 20:06:16 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 27327 invoked by uid 99); 13 Dec 2012 20:06:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Dec 2012 20:06:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Dec 2012 20:06:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1C83D2388A36; Thu, 13 Dec 2012 20:05:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1421477 - /jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java Date: Thu, 13 Dec 2012 20:05:52 -0000 To: commits@jackrabbit.apache.org From: unico@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121213200553.1C83D2388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: unico Date: Thu Dec 13 20:05:51 2012 New Revision: 1421477 URL: http://svn.apache.org/viewvc?rev=1421477&view=rev Log: JCR-3483 nullify current node element before session is alive check is made Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java?rev=1421477&r1=1421476&r2=1421477&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java (original) +++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java Thu Dec 13 20:05:51 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 { public Object perform(SessionContext context) { - next = null; // reset ItemManager itemMgr = context.getItemManager(); while (next == null && scoreNodes.hasNext()) {