summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-25 02:40:11 (EST)
committer Winston Prakash2011-12-01 20:47:33 (EST)
commit11defcee7c051c5f4c7d5a2694a07e9a32e5857a (patch)
tree586168ca4b737cfcbf49f21743f690ddabf0cd46
parent487cf1eeb9d070004ff22c6550cd9db558b07d27 (diff)
downloadorg.eclipse.hudson.core-11defcee7c051c5f4c7d5a2694a07e9a32e5857a.zip
org.eclipse.hudson.core-11defcee7c051c5f4c7d5a2694a07e9a32e5857a.tar.gz
org.eclipse.hudson.core-11defcee7c051c5f4c7d5a2694a07e9a32e5857a.tar.bz2
Fix Exception while evaluation jelly expression for ChangeLogSet. Use guave empty iterator instead of apache-collections
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/src/main/java/hudson/scm/ChangeLogSet.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/hudson-core/src/main/java/hudson/scm/ChangeLogSet.java b/hudson-core/src/main/java/hudson/scm/ChangeLogSet.java
index 7989422..c8e1292 100644
--- a/hudson-core/src/main/java/hudson/scm/ChangeLogSet.java
+++ b/hudson-core/src/main/java/hudson/scm/ChangeLogSet.java
@@ -16,6 +16,7 @@
package hudson.scm;
+import com.google.common.collect.Iterators;
import hudson.MarkupText;
import hudson.Util;
import hudson.model.AbstractBuild;
@@ -24,7 +25,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.iterators.EmptyIterator;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
@@ -73,7 +73,7 @@ public abstract class ChangeLogSet<T extends ChangeLogSet.Entry> implements Iter
*/
@SuppressWarnings("unchecked")
public Iterator<T> iterator() {
- return isEmptySet()? EmptyIterator.INSTANCE: getLogs().iterator();
+ return isEmptySet()? Iterators.<T>emptyIterator(): getLogs().iterator();
}
/**