summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2007-04-23 10:54:32 +0000
committerMark Wielaard <mark@klomp.org>2007-04-23 10:54:32 +0000
commita146f07a247adb632938440cfdb896b6d107a05a (patch)
tree71b9e9a88e804e95f03ebfc7f710974c0c3004b9
parentf2c4696e60c7c8a4b74083d277091556270eb833 (diff)
downloadclasspath-a146f07a247adb632938440cfdb896b6d107a05a.tar.gz
2007-04-23 Jeroen Frijters <jeroen@frijters.net>
PR classpath/31646: * java/util/Arrays.java (qsort): Corrected initial median calculation.
-rw-r--r--ChangeLog5
-rw-r--r--java/util/Arrays.java14
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e242b9562..3456703bd 100644
--- a/ChangeLog
+++ b/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 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/acinclude.m4
diff --git a/java/util/Arrays.java b/java/util/Arrays.java
index 8f7049377..9443ced5b 100644
--- a/java/util/Arrays.java
+++ b/java/util/Arrays.java
@@ -1309,7 +1309,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;
@@ -1473,7 +1473,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;
@@ -1637,7 +1637,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;
@@ -1813,7 +1813,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;
@@ -1989,7 +1989,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;
@@ -2159,7 +2159,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;
@@ -2329,7 +2329,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;