Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 93FA1DA30 for ; Tue, 6 Nov 2012 13:30:10 +0000 (UTC) Received: (qmail 79516 invoked by uid 500); 6 Nov 2012 13:30:10 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 79486 invoked by uid 500); 6 Nov 2012 13:30:10 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 79455 invoked by uid 99); 6 Nov 2012 13:30:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Nov 2012 13:30:09 +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; Tue, 06 Nov 2012 13:30:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 069D62388980; Tue, 6 Nov 2012 13:29:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1406128 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java Date: Tue, 06 Nov 2012 13:29:45 -0000 To: oak-commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121106132946.069D62388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Tue Nov 6 13:29:45 2012 New Revision: 1406128 URL: http://svn.apache.org/viewvc?rev=1406128&view=rev Log: OAK-423 Query: org.apache.jackrabbit.oak.spi.query.Cursor.currentRow called too late (prevent future bugs) Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java?rev=1406128&r1=1406127&r2=1406128&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java Tue Nov 6 13:29:45 2012 @@ -121,6 +121,8 @@ public class Cursors { private long readCount; + private boolean closed; + public TraversingCursor(String statement, Filter filter, NodeState root) { this.statement = statement; this.filter = filter; @@ -170,6 +172,9 @@ public class Cursors { @Override public IndexRow currentRow() { + if (closed) { + throw new IllegalStateException("This cursor is closed"); + } return new IndexRowImpl(currentPath); } @@ -204,6 +209,7 @@ public class Cursors { } } currentPath = null; + closed = true; return false; }