From: Marco Trudel Date: Tue, 23 Jan 2007 23:30:54 +0000 (+0100) Subject: Arrays.java (binarySearch): Change comparison order. X-Git-Tag: releases/gcc-4.3.0~7302 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26578e6092fa642babf6a621c89bebd6f237f0e5;p=thirdparty%2Fgcc.git Arrays.java (binarySearch): Change comparison order. 2007-01-23 Marco Trudel * java/util/Arrays.java (binarySearch): Change comparison order. From-SVN: r121091 --- diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 3a3d8a221fe4..489b9aa8cf7d 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,7 @@ +2007-01-23 Marco Trudel + + * java/util/Arrays.java (binarySearch): Change comparison order. + 2007-01-17 Tom Tromey * tools/gnu/classpath/tools/javah/PathOptionGroup.java diff --git a/libjava/classpath/java/util/Arrays.java b/libjava/classpath/java/util/Arrays.java index fbbf43f209b2..723142437855 100644 --- a/libjava/classpath/java/util/Arrays.java +++ b/libjava/classpath/java/util/Arrays.java @@ -1,5 +1,5 @@ /* Arrays.java -- Utility class with methods to operate on arrays - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -370,10 +370,13 @@ public class Arrays while (low <= hi) { mid = (low + hi) >>> 1; - final int d = Collections.compare(key, a[mid], c); + // NOTE: Please keep the order of a[mid] and key. Although + // not required by the specs, the RI has it in this order as + // well, and real programs (erroneously) depend on it. + final int d = Collections.compare(a[mid], key, c); if (d == 0) return mid; - else if (d < 0) + else if (d > 0) hi = mid - 1; else // This gets the insertion point right on the last loop diff --git a/libjava/classpath/lib/java/util/Arrays$ArrayList.class b/libjava/classpath/lib/java/util/Arrays$ArrayList.class index 98cdfd0e0705..bd2e14ab1bc0 100644 Binary files a/libjava/classpath/lib/java/util/Arrays$ArrayList.class and b/libjava/classpath/lib/java/util/Arrays$ArrayList.class differ diff --git a/libjava/classpath/lib/java/util/Arrays.class b/libjava/classpath/lib/java/util/Arrays.class index 5dcf6af3f41a..6b86decd3e39 100644 Binary files a/libjava/classpath/lib/java/util/Arrays.class and b/libjava/classpath/lib/java/util/Arrays.class differ