You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2007/05/16 12:29:07 UTC
svn commit: r538520 -
/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java
Author: apetrenko
Date: Wed May 16 03:29:01 2007
New Revision: 538520
URL: http://svn.apache.org/viewvc?view=rev&rev=538520
Log:
Patch for HARMONY-3339 "[classlib][luni][EUT] 51 tests fail in jdtcoremodel suit with NullPointerException"
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java?view=diff&rev=538520&r1=538519&r2=538520
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java Wed May 16 03:29:01 2007
@@ -2434,7 +2434,7 @@
// merging
// if arrays are already sorted - no merge
- if (((Comparable<Object>) in[med]).compareTo(in[med - 1]) >= 0) {
+ if (((Comparable<Object>) in[med - 1]).compareTo(in[med]) <= 0) {
System.arraycopy(in, fromIndex, out, fromIndex, len);
return;
}
@@ -2521,7 +2521,7 @@
// merging
// if arrays are already sorted - no merge
- if (c.compare(in[med], in[med - 1]) >= 0) {
+ if (c.compare(in[med - 1],in[med] ) <= 0) {
System.arraycopy(in, fromIndex, out, fromIndex, len);
return;
}