| author | akozak | 2011-11-25 02:40:11 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:47:33 (EST) |
| commit | a24c5d7c69262484dc03d9bb6cf373de7fb1a4cc (patch) (side-by-side diff) | |
| tree | 77f428c5fd4fba6c9d4d2c1c27c787ae2d98200b | |
| parent | 361ef7ec385be712186aad1d09edf471e31e0f59 (diff) | |
| download | org.eclipse.hudson.core-a24c5d7c69262484dc03d9bb6cf373de7fb1a4cc.zip org.eclipse.hudson.core-a24c5d7c69262484dc03d9bb6cf373de7fb1a4cc.tar.gz org.eclipse.hudson.core-a24c5d7c69262484dc03d9bb6cf373de7fb1a4cc.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.java | 4 |
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(); } /** |

