diff options
| author | Jeroen Frijters <jeroen@frijters.net> | 2007-04-23 16:15:51 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-04-23 16:15:51 +0000 |
| commit | f91141b1a282aaf28c0a74f228db5591806ee917 (patch) | |
| tree | 4de9b3c5c0b23e1808441d9b39f4283da6d7c821 /libjava/classpath | |
| parent | 9a072eb638e63c0706890a890d1edc428b2fb01d (diff) | |
| download | gcc-f91141b1a282aaf28c0a74f228db5591806ee917.zip gcc-f91141b1a282aaf28c0a74f228db5591806ee917.tar.gz gcc-f91141b1a282aaf28c0a74f228db5591806ee917.tar.bz2 | |
re PR classpath/31646 (Arrays.sort() broken)
2007-04-23 Jeroen Frijters <jeroen@frijters.net>
PR classpath/31646:
* java/util/Arrays.java (qsort): Corrected initial median calculation.
From-SVN: r124071
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/classpath/java/util/Arrays.java | 14 | ||||
| -rw-r--r-- | libjava/classpath/lib/java/util/Arrays.class | bin | 26603 -> 26617 bytes |
3 files changed, 12 insertions, 7 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 777fa6d..0e6c85c 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,8 @@ +2007-04-23 Jeroen Frijters <jeroen@frijters.net> + + PR classpath/31646: + * java/util/Arrays.java (qsort): Corrected initial median calculation. + 2007-04-19 Casey Marshall <csm@gnu.org> PR classpath/31626: diff --git a/libjava/classpath/java/util/Arrays.java b/libjava/classpath/java/util/Arrays.java index 7231424..41e8045 100644 --- a/libjava/classpath/java/util/Arrays.java +++ b/libjava/classpath/java/util/Arrays.java @@ -1040,7 +1040,7 @@ public class Arrays } // Determine a good median element. - int mid = count / 2; + int mid = from + count / 2; int lo = from; int hi = from + count - 1; @@ -1204,7 +1204,7 @@ public class Arrays } // Determine a good median element. - int mid = count / 2; + int mid = from + count / 2; int lo = from; int hi = from + count - 1; @@ -1368,7 +1368,7 @@ public class Arrays } // Determine a good median element. - int mid = count / 2; + int mid = from + count / 2; int lo = from; int hi = from + count - 1; @@ -1544,7 +1544,7 @@ public class Arrays } // Determine a good median element. - int mid = count / 2; + int mid = from + count / 2; int lo = from; int hi = from + count - 1; @@ -1720,7 +1720,7 @@ public class Arrays } // Determine a good median element. - int mid = count / 2; + int mid = from + count / 2; int lo = from; int hi = from + count - 1; @@ -1890,7 +1890,7 @@ public class Arrays } // Determine a good median element. - int mid = count / 2; + int mid = from + count / 2; int lo = from; int hi = from + count - 1; @@ -2060,7 +2060,7 @@ public class Arrays } // Determine a good median element. - int mid = count / 2; + int mid = from + count / 2; int lo = from; int hi = from + count - 1; diff --git a/libjava/classpath/lib/java/util/Arrays.class b/libjava/classpath/lib/java/util/Arrays.class Binary files differindex 6b86dec..3f3359e 100644 --- a/libjava/classpath/lib/java/util/Arrays.class +++ b/libjava/classpath/lib/java/util/Arrays.class |