aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Frijters <jeroen@frijters.net>2007-04-23 16:17:56 +0000
committerTom Tromey <tromey@redhat.com>2007-04-23 16:17:56 +0000
commit98975b823b8f64c59b162c20e3c0303fdb7a7b8b (patch)
treeb6aa3193de987e1bbc370c6f0cc5e48436b888d8
parent8f22ff7677b34f60a5b298b36dfbecc905087244 (diff)
2007-04-23 Jeroen Frijters <jeroen@frijters.net>
PR classpath/31646: * java/util/Arrays.java (qsort): Corrected initial median calculation. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_1-branch@124072 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/classpath/ChangeLog5
-rw-r--r--libjava/classpath/java/util/Arrays.java14
2 files changed, 12 insertions, 7 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 5ef453bfe99..1bcb0b3697c 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;