From 40b988b4258f719e5a8ff199127b45de3c0d8da8 Mon Sep 17 00:00:00 2001 From: tromey Date: Tue, 23 Jan 2007 23:30:54 +0000 Subject: 2007-01-23 Marco Trudel * java/util/Arrays.java (binarySearch): Change comparison order. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121091 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/java/util/Arrays.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libjava/classpath/java/util/Arrays.java') diff --git a/libjava/classpath/java/util/Arrays.java b/libjava/classpath/java/util/Arrays.java index fbbf43f209b..72314243785 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 -- cgit v1.2.3