svn commit: r1519956 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java

[thomasm]

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<String> aggregates = null;
+        private Iterator<String> 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;