--- a/jdk/src/java.base/share/classes/java/util/BitSet.java	Mon Apr 06 13:41:10 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/BitSet.java	Tue Apr 07 10:33:08 2015 +0100
@@ -1229,7 +1229,7 @@
             public int nextInt() {
                 if (next != -1) {
                     int ret = next;
-                    next = nextSetBit(next+1);
+                    next = (next == Integer.MAX_VALUE) ? -1 : nextSetBit(next+1);
                     return ret;
                 } else {
                     throw new NoSuchElementException();