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 E4C911058B for ; Wed, 4 Sep 2013 09:30:27 +0000 (UTC) Received: (qmail 23474 invoked by uid 500); 4 Sep 2013 09:30:27 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 23436 invoked by uid 500); 4 Sep 2013 09:30:26 -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 23427 invoked by uid 99); 4 Sep 2013 09:30:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Sep 2013 09:30:23 +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; Wed, 04 Sep 2013 09:30:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A424423888CD; Wed, 4 Sep 2013 09:30:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1519956 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java Date: Wed, 04 Sep 2013 09:30:01 -0000 To: oak-commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130904093001.A424423888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Wed Sep 4 09:30:01 2013 New Revision: 1519956 URL: http://svn.apache.org/r1519956 Log: OAK-983 Non full-text indices should ignore queries that have full-text constraints (checkstyle) Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java?rev=1519956&r1=1519955&r2=1519956&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java Wed Sep 4 09:30:01 2013 @@ -90,8 +90,9 @@ public class AggregateIndex implements F return baseIndex.getNodeAggregator(); } - // ----- aggregation aware cursor - + /** + * An aggregation aware cursor. + */ private static class AggregationCursor extends AbstractCursor { private final Cursor cursor; @@ -100,9 +101,9 @@ public class AggregateIndex implements F private boolean init; private boolean closed; - private Iterator aggregates = null; + private Iterator aggregates; - private String item = null; + private String item; public AggregationCursor(Cursor cursor, NodeAggregator aggregator, NodeState rootState) { @@ -140,7 +141,7 @@ public class AggregateIndex implements F @Override public IndexRow next() { - if (hasNext() == false) { + if (!hasNext()) { throw new NoSuchElementException(); } init = false;