From a146f07a247adb632938440cfdb896b6d107a05a Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Mon, 23 Apr 2007 10:54:32 +0000
Subject: 2007-04-23  Jeroen Frijters  <jeroen@frijters.net>

       PR classpath/31646:
       * java/util/Arrays.java (qsort): Corrected initial median calculation.
---
 ChangeLog             |  5 +++++
 java/util/Arrays.java | 14 +++++++-------
 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;
 
-- 
cgit v1.2.1