diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-23 16:15:51 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-23 16:15:51 +0000 |
| commit | 68e6f1c34e43f9ac799a2a5c467e0bdd7138997a (patch) | |
| tree | 4de9b3c5c0b23e1808441d9b39f4283da6d7c821 | |
| parent | 238270c659d483108897274b3a160c382ec915c9 (diff) | |
| download | gcc-68e6f1c34e43f9ac799a2a5c467e0bdd7138997a.tar.gz | |
2007-04-23 Jeroen Frijters <jeroen@frijters.net>
PR classpath/31646:
* java/util/Arrays.java (qsort): Corrected initial median calculation.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124071 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 777fa6d9107..0e6c85cbbbd 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 72314243785..41e80455104 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 6b86decd3e3..3f3359e73c6 100644 --- a/libjava/classpath/lib/java/util/Arrays.class +++ b/libjava/classpath/lib/java/util/Arrays.class |