You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2005/05/22 19:27:34 UTC
svn commit: r171347 - in /jakarta/commons/proper/collections/trunk:
RELEASE-NOTES.html
src/java/org/apache/commons/collections/iterators/IteratorChain.java
src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
Author: scolebourne
Date: Sun May 22 10:27:34 2005
New Revision: 171347
URL: http://svn.apache.org/viewcvs?rev=171347&view=rev
Log:
Bug 34267: IteratorChain.remove() in combination with FilterIterator
Modified:
jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/IteratorChain.java
jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
Modified: jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html?rev=171347&r1=171346&r2=171347&view=diff
==============================================================================
--- jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html (original)
+++ jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html Sun May 22 10:27:34 2005
@@ -70,6 +70,7 @@
<li>TransformedMap.putAll - Now allows putAll of an empty map [34686]</li>
<li>AbstractHashedMap deserialization - Fix to prevent doubling of internal data array [34265]</li>
<li>Flat3Map.equals() - Fix to make flat mode comparison actually work [34917]</li>
+<li>IteratorChain.remove() - Fix to avoid IllegalStateException when one of the underlying iterators is a FilterIterator [34267]</li>
</ul>
<center><h3>JAVADOC</h3></center>
Modified: jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/IteratorChain.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/IteratorChain.java?rev=171347&r1=171346&r2=171347&view=diff
==============================================================================
--- jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/IteratorChain.java (original)
+++ jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/IteratorChain.java Sun May 22 10:27:34 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
+ * Copyright 1999-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -280,7 +280,7 @@
*/
public void remove() {
lockChain();
- if( currentIterator == null ) {
+ if (currentIterator == null) {
updateCurrentIterator();
}
lastUsedIterator.remove();
Modified: jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java?rev=171347&r1=171346&r2=171347&view=diff
==============================================================================
--- jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java (original)
+++ jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java Sun May 22 10:27:34 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,11 +19,10 @@
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import java.util.LinkedList;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.commons.collections.PredicateUtils;
+
import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.collections.Predicate;
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org