From 42f7a5b96299de1d52fb4d968ee7eb2a6d0e1536 Mon Sep 17 00:00:00 2001 From: ray Date: Mon, 25 Aug 2008 06:55:08 +0000 Subject: [PATCH] A slightly more subtle version of contains() so that it does the right thing if null is passed in. git-svn-id: https://samskivert.googlecode.com/svn/trunk@1520 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../src/java/com/samskivert/util/SortableArrayList.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/samskivert/src/java/com/samskivert/util/SortableArrayList.java b/projects/samskivert/src/java/com/samskivert/util/SortableArrayList.java index d5636a25..f9eab756 100644 --- a/projects/samskivert/src/java/com/samskivert/util/SortableArrayList.java +++ b/projects/samskivert/src/java/com/samskivert/util/SortableArrayList.java @@ -156,7 +156,11 @@ public class SortableArrayList extends AbstractList // documentation inherited from interface public boolean contains (Object o) { - return ListUtil.contains(_elements, o); + // we can't use ListUtil.contains() because our _elements + // array is larger than _size and we want to do the right thing + // if null is passed in. + int dex = ListUtil.indexOf(_elements, o); + return (dex >= 0 && dex < _size); } // documentation inherited from interface