From 9e836c10444dc518e9d8b6314678dbaaa8f9e4c4 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 30 May 2013 20:16:10 +0400 Subject: [PATCH] IterableCollection possibly race conditions fixed --- .../corundumstudio/socketio/misc/IterableCollection.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/corundumstudio/socketio/misc/IterableCollection.java b/src/main/java/com/corundumstudio/socketio/misc/IterableCollection.java index 26eac02..c973427 100644 --- a/src/main/java/com/corundumstudio/socketio/misc/IterableCollection.java +++ b/src/main/java/com/corundumstudio/socketio/misc/IterableCollection.java @@ -20,22 +20,20 @@ import java.util.Iterator; public class IterableCollection extends AbstractCollection { - private final Iterable iterable; - private final Iterable sizeIterable; + private final CompositeIterable iterable; public IterableCollection(CompositeIterable iterable) { this.iterable = iterable; - this.sizeIterable = new CompositeIterable(iterable); } @Override public Iterator iterator() { - return iterable.iterator(); + return new CompositeIterable(iterable).iterator(); } @Override public int size() { - Iterator iterator = sizeIterable.iterator(); + Iterator iterator = new CompositeIterable(iterable).iterator(); int count = 0; while (iterator.hasNext()) { iterator.next();