You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/08/18 20:03:11 UTC

svn commit: r1374623 - in /lucene/dev/trunk: ./ lucene/ lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java

Author: mikemccand
Date: Sat Aug 18 18:03:10 2012
New Revision: 1374623

URL: http://svn.apache.org/viewvc?rev=1374623&view=rev
Log:
use hasNext not .next() == null to detect empty iterator

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/test-framework/   (props changed)
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java?rev=1374623&r1=1374622&r2=1374623&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java Sat Aug 18 18:03:10 2012
@@ -62,8 +62,13 @@ public final class FieldFilterAtomicRead
       return null;
     }
     f = new FieldFilterFields(f);
-    // we need to check for emptyness, so we can return null:
-    return (f.iterator().next() == null) ? null : f;
+    // we need to check for emptyness, so we can return
+    // null:
+    if (f.iterator().hasNext()) {
+      return f;
+    } else {
+      return null;
+    }
   }
 
   @Override