You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/07/19 16:10:24 UTC
svn commit: r965491 -
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils/src/main/java/org/apache/clerezza/utils/IteratorMerger.java
Author: reto
Date: Mon Jul 19 14:10:24 2010
New Revision: 965491
URL: http://svn.apache.org/viewvc?rev=965491&view=rev
Log:
IteartorMerger to merge an empty iterator of iterator
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils/src/main/java/org/apache/clerezza/utils/IteratorMerger.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils/src/main/java/org/apache/clerezza/utils/IteratorMerger.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils/src/main/java/org/apache/clerezza/utils/IteratorMerger.java?rev=965491&r1=965490&r2=965491&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils/src/main/java/org/apache/clerezza/utils/IteratorMerger.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils/src/main/java/org/apache/clerezza/utils/IteratorMerger.java Mon Jul 19 14:10:24 2010
@@ -19,6 +19,7 @@
package org.apache.clerezza.utils;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -70,7 +71,11 @@ public class IteratorMerger<T> implement
private void init(Iterator<Iterator<T>> baseIterators) {
this.baseIterators = baseIterators;
- current = baseIterators.next();
+ if (baseIterators.hasNext()) {
+ current = baseIterators.next();
+ } else {
+ current = new ArrayList<T>(0).iterator();
+ }
}
private void updateCurrentIfNeeded() {