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

Fix NullPointerException in CursorableLinkedList.remove(Object) and 

CursorableLinkedList.contains(Object) methods when the argument is
null.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130717 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Smith 2002-06-15 03:52:24 +00:00
parent 5fe503ec59
commit e9f2bdc6a5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/apache/commons/collections/CursorableLinkedList.java
View File

@ -1,7 +1,7 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v 1.6 2002/06/12 03:59:15 mas Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v 1.7 2002/06/15 03:52:24 mas Exp $
* $Revision: 1.6 $ * $Revision: 1.7 $
* $Date: 2002/06/12 03:59:15 $ * $Date: 2002/06/15 03:52:24 $
* *
* ==================================================================== * ====================================================================
* *
@ -92,7 +92,7 @@ import java.lang.UnsupportedOperationException; // stops a javadoc warning
* *
* @since 1.0 * @since 1.0
* @author Rodney Waldhoff * @author Rodney Waldhoff
* @version $Id: CursorableLinkedList.java,v 1.6 2002/06/12 03:59:15 mas Exp $ * @version $Id: CursorableLinkedList.java,v 1.7 2002/06/15 03:52:24 mas Exp $
* @see java.util.LinkedList * @see java.util.LinkedList
*/ */
public class CursorableLinkedList implements List, Serializable { public class CursorableLinkedList implements List, Serializable {
@ -263,7 +263,8 @@ public class CursorableLinkedList implements List, Serializable {
*/ */
public boolean contains(Object o) { public boolean contains(Object o) {
for(Listable elt = _head.next(), past = null; null != elt && past != _head.prev(); elt = (past = elt).next()) { for(Listable elt = _head.next(), past = null; null != elt && past != _head.prev(); elt = (past = elt).next()) {
if((null == o && null == elt.value()) || (o.equals(elt.value()))) { if((null == o && null == elt.value()) ||
(o != null && o.equals(elt.value()))) {
return true; return true;
} }
} }
@ -530,7 +531,7 @@ public class CursorableLinkedList implements List, Serializable {
if(null == o && null == elt.value()) { if(null == o && null == elt.value()) {
removeListable(elt); removeListable(elt);
return true; return true;
} else if(o.equals(elt.value())) { } else if(o != null && o.equals(elt.value())) {
removeListable(elt); removeListable(elt);
return true; return true;
} }