rwaldhoff 01/05/17 17:12:45 Modified: collections/src/java/org/apache/commons/collections FastHashMap.java FastTreeMap.java Log: I pretty sure this fixes bug 1729 (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1729) but I don't have an environment to test it. It certainly doesn't break anything. Revision Changes Path 1.3 +6 -6 jakarta-commons/collections/src/java/org/apache/commons/collections/FastHashMap.java Index: FastHashMap.java =================================================================== RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastHashMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FastHashMap.java 2001/04/21 12:19:57 1.2 +++ FastHashMap.java 2001/05/18 00:12:45 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastHashMap.java,v 1.2 2001/04/21 12:19:57 craigmcc Exp $ - * $Revision: 1.2 $ - * $Date: 2001/04/21 12:19:57 $ + * $Header: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastHashMap.java,v 1.3 2001/05/18 00:12:45 rwaldhoff Exp $ + * $Revision: 1.3 $ + * $Date: 2001/05/18 00:12:45 $ * * ==================================================================== * @@ -95,7 +95,7 @@ * maximum performance.</p> * * @author Craig R. McClanahan - * @version $Revision: 1.2 $ $Date: 2001/04/21 12:19:57 $ + * @version $Revision: 1.3 $ $Date: 2001/05/18 00:12:45 $ */ public class FastHashMap extends HashMap { @@ -302,7 +302,7 @@ return (false); Iterator i = map.entrySet().iterator(); while (i.hasNext()) { - Entry e = (Entry) i.next(); + Map.Entry e = (Map.Entry) i.next(); Object key = e.getKey(); Object value = e.getValue(); if (value == null) { @@ -320,7 +320,7 @@ return (false); Iterator i = map.entrySet().iterator(); while (i.hasNext()) { - Entry e = (Entry) i.next(); + Map.Entry e = (Map.Entry) i.next(); Object key = e.getKey(); Object value = e.getValue(); if (value == null) { 1.3 +6 -6 jakarta-commons/collections/src/java/org/apache/commons/collections/FastTreeMap.java Index: FastTreeMap.java =================================================================== RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastTreeMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FastTreeMap.java 2001/04/21 12:19:57 1.2 +++ FastTreeMap.java 2001/05/18 00:12:45 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastTreeMap.java,v 1.2 2001/04/21 12:19:57 craigmcc Exp $ - * $Revision: 1.2 $ - * $Date: 2001/04/21 12:19:57 $ + * $Header: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastTreeMap.java,v 1.3 2001/05/18 00:12:45 rwaldhoff Exp $ + * $Revision: 1.3 $ + * $Date: 2001/05/18 00:12:45 $ * * ==================================================================== * @@ -97,7 +97,7 @@ * maximum performance.</p> * * @author Craig R. McClanahan - * @version $Revision: 1.2 $ $Date: 2001/04/21 12:19:57 $ + * @version $Revision: 1.3 $ $Date: 2001/05/18 00:12:45 $ */ public class FastTreeMap extends TreeMap { @@ -322,7 +322,7 @@ return (false); Iterator i = map.entrySet().iterator(); while (i.hasNext()) { - Entry e = (Entry) i.next(); + Map.Entry e = (Map.Entry) i.next(); Object key = e.getKey(); Object value = e.getValue(); if (value == null) { @@ -340,7 +340,7 @@ return (false); Iterator i = map.entrySet().iterator(); while (i.hasNext()) { - Entry e = (Entry) i.next(); + Map.Entry e = (Map.Entry) i.next(); Object key = e.getKey(); Object value = e.getValue(); if (value == null) {