You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2015/05/04 23:17:12 UTC

svn commit: r1677689 - /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java

Author: schor
Date: Mon May  4 21:17:12 2015
New Revision: 1677689

URL: http://svn.apache.org/r1677689
Log:
[UIMA-4377] don't allow moveToNext/Previous for an invalid iterator to make it become valid.

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java?rev=1677689&r1=1677688&r2=1677689&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java Mon May  4 21:17:12 2015
@@ -777,12 +777,18 @@ public class IntHashSet implements Posit
 
   @Override
   public int moveToNext(int position) {
+    if (position < 0) {
+      return position;
+    }
     final int n = moveToNextFilled(position + 1); 
-    return (n == getCapacity()) ? -1 : n;
+    return (n >= getCapacity()) ? -1 : n;
   }
 
   @Override
   public int moveToPrevious(int position) {
+    if (position >= getCapacity()) {
+      return -1;
+    }
     return moveToPreviousFilled(position - 1);
   }