scolebourne 2003/02/19 11:54:12 Modified: collections/src/java/org/apache/commons/collections StaticBucketMap.java Log: Fix bug in remove() from Leo Sutic Revision Changes Path 1.7 +15 -16 jakarta-commons/collections/src/java/org/apache/commons/collections/StaticBucketMap.java Index: StaticBucketMap.java =================================================================== RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/StaticBucketMap.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- StaticBucketMap.java 18 Oct 2002 07:03:12 -0000 1.6 +++ StaticBucketMap.java 19 Feb 2003 19:54:12 -0000 1.7 @@ -1,13 +1,10 @@ /* * $Header$ - * $Revision$ - * $Date$ - * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,11 +20,11 @@ * distribution. * * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: + * any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. * * 4. The names "The Jakarta Project", "Commons", and "Apache Software * Foundation" must not be used to endorse or promote products derived @@ -36,7 +33,7 @@ * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. + * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -132,12 +129,14 @@ * iterations, or if you can make your own guarantees about how bulk * operations will affect the map.<P> * - * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @author <a href="mailto:[EMAIL PROTECTED]">Gerhard Froehlich</a> - * @author <a href="mailto:[EMAIL PROTECTED]">Michael A. Smith</a> - * @author Paul Jack - * @version CVS $Revision$ $Date$ - * @since Collections 2.1 + * @since Commons Collections 2.1 + * @version $Revision$ $Date$ + * + * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Gerhard Froehlich</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Michael A. Smith</a> + * @author Paul Jack + * @author Leo Sutic */ public final class StaticBucketMap implements Map { @@ -401,7 +400,7 @@ while( n != null ) { - if( n.key == null || ( n.key != null && n.key.equals( key ) ) ) + if( n.key == key || ( n.key != null && n.key.equals( key ) ) ) { // Remove this node from the linked list of nodes. if( null == prev )
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]