[Japi-cvs] SF.net SVN: japi: [465] libs/util/trunk/src/net/sf/japi/util/Arrays2.java

[<chr...@us...>]

Revision: 465
          http://svn.sourceforge.net/japi/?rev=465&view=rev
Author:   christianhujer
Date:     2007-06-30 02:22:22 -0700 (Sat, 30 Jun 2007)

Log Message:
-----------
Fixed possible NPE in linearEqualitySearch().

Modified Paths:
--------------
    libs/util/trunk/src/net/sf/japi/util/Arrays2.java

Modified: libs/util/trunk/src/net/sf/japi/util/Arrays2.java
===================================================================
--- libs/util/trunk/src/net/sf/japi/util/Arrays2.java	2007-06-30 09:14:17 UTC (rev 464)
+++ libs/util/trunk/src/net/sf/japi/util/Arrays2.java	2007-06-30 09:22:22 UTC (rev 465)
@@ -516,7 +516,7 @@
      */
     public static int linearEqualitySearch(@Nullable final Object o, final int fromIndex, final int toIndex, @NotNull final Object[] data) {
         for (int i = fromIndex; i < toIndex; i++) {
-            if (o == null && data[i] == null || data[i].equals(o)) {
+            if (o == null && data[i] == null ||  o != null && o.equals(data[i]) || data[i].equals(o)) {
                 return i;
             }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.