aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/classpath')
-rw-r--r--libjava/classpath/ChangeLog5
-rw-r--r--libjava/classpath/java/util/Arrays.java14
-rw-r--r--libjava/classpath/lib/java/util/Arrays.classbin26603 -> 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
index 6b86dec..3f3359e 100644
--- a/libjava/classpath/lib/java/util/Arrays.class
+++ b/libjava/classpath/lib/java/util/Arrays.class
Binary files differ