Merge branch 'master' of github.com:bculkin2442/bjc-utils2

1 files changed, 10 insertions, 9 deletions

diff --git a/base/src/main/java/bjc/utils/data/CircularIterator.java b/base/src/main/java/bjc/utils/data/CircularIterator.java
index 4558b63..9af4d87 100644
--- a/base/src/main/java/bjc/utils/data/CircularIterator.java
+++ b/base/src/main/java/bjc/utils/data/CircularIterator.java
@@ -8,7 +8,7 @@ import java.util.Iterator;
  * @author EVE
  *
  * @param <E>
- *        The type of the iterable.
+ *                The type of the iterable.
  */
 public class CircularIterator<E> implements Iterator<E> {
 	/* The iterable, and our current iterator into it. */
@@ -28,11 +28,11 @@ public class CircularIterator<E> implements Iterator<E> {
 	 * Create a new circular iterator.
 	 *
 	 * @param src
-	 *        The iterable to iterate from.
+	 *                The iterable to iterate from.
 	 *
 	 * @param circ
-	 *        Should we actually do circular iteration, or just repeat the
-	 *        terminal element?
+	 *                Should we actually do circular iteration, or just
+	 *                repeat the terminal element?
 	 */
 	public CircularIterator(final Iterable<E> src, final boolean circ) {
 		source = src;
@@ -45,7 +45,7 @@ public class CircularIterator<E> implements Iterator<E> {
 	 * Create a new circular iterator that does actual circular iteration.
 	 *
 	 * @param src
-	 *        The iterable to iterate from.
+	 *                The iterable to iterate from.
 	 */
 	public CircularIterator(final Iterable<E> src) {
 		this(src, true);
@@ -59,11 +59,12 @@ public class CircularIterator<E> implements Iterator<E> {
 
 	@Override
 	public E next() {
-		if(!curr.hasNext()) {
-			if(doCircle) {
-				curr = source.iterator();
-			} else
+		if (!curr.hasNext()) {
+			if (!doCircle) {
 				return curElm;
+			}
+			
+			curr = source.iterator();
 		}
 
 		curElm = curr.next();