Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure that the keySet and values views handle removed elements 

bug 25551, from Joe Raysa


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131479 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2003-12-29 15:35:54 +00:00
parent a7f9fcfb60
commit e6d11cfee8
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/java/org/apache/commons/collections/ReferenceMap.java
View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ReferenceMap.java,v 1.19 2003/12/06 13:03:15 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ReferenceMap.java,v 1.20 2003/12/29 15:35:54 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -119,7 +119,7 @@ import org.apache.commons.collections.keyvalue.DefaultMapEntry;
*
* @deprecated Moved to map subpackage. Due to be removed in v4.0.
* @since Commons Collections 2.1
* @version $Revision: 1.19 $ $Date: 2003/12/06 13:03:15 $
* @version $Revision: 1.20 $ $Date: 2003/12/29 15:35:54 $
*
* @author Paul Jack
*/
@ -706,7 +706,7 @@ public class ReferenceMap extends AbstractMap {
if (keySet != null) return keySet;
keySet = new AbstractSet() {
public int size() {
return size;
return ReferenceMap.this.size();
}
public Iterator iterator() {
@ -727,6 +727,17 @@ public class ReferenceMap extends AbstractMap {
ReferenceMap.this.clear();
}
public Object[] toArray() {
return toArray(new Object[0]);
}
public Object[] toArray(Object[] array) {
Collection c = new ArrayList(size());
for (Iterator it = iterator(); it.hasNext(); ) {
c.add(it.next());
}
return c.toArray(array);
}
};
return keySet;
}
@ -741,7 +752,7 @@ public class ReferenceMap extends AbstractMap {
if (values != null) return values;
values = new AbstractCollection() {
public int size() {
return size;
return ReferenceMap.this.size();
}
public void clear() {
@ -751,6 +762,18 @@ public class ReferenceMap extends AbstractMap {
public Iterator iterator() {
return new ValueIterator();
}
public Object[] toArray() {
return toArray(new Object[0]);
}
public Object[] toArray(Object[] array) {
Collection c = new ArrayList(size());
for (Iterator it = iterator(); it.hasNext(); ) {
c.add(it.next());
}
return c.toArray(array);
}
};
return values;
}