From f91141b1a282aaf28c0a74f228db5591806ee917 Mon Sep 17 00:00:00 2001 From: Jeroen Frijters Date: Mon, 23 Apr 2007 16:15:51 +0000 Subject: [PATCH] re PR classpath/31646 (Arrays.sort() broken) 2007-04-23 Jeroen Frijters PR classpath/31646: * java/util/Arrays.java (qsort): Corrected initial median calculation. From-SVN: r124071 --- libjava/classpath/ChangeLog | 5 +++++ libjava/classpath/java/util/Arrays.java | 14 +++++++------- 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 + + PR classpath/31646: + * java/util/Arrays.java (qsort): Corrected initial median calculation. + 2007-04-19 Casey Marshall 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 index 6b86decd3e39fb78fc6b791b1ac9af6fdcc8c953..3f3359e73c698e5941a4bf7e6f52bdc7e57f27a3 100644 GIT binary patch delta 2336 zcmd7TeN2^Q7zXg`*5|pO2bBd1f`VTt#85O76Gai^=m7-mm>*?9rD-#fiZ#trkCs_# z0&>z7X;BtNZ4Gyt)67J1l&!Ly>q91B!=@7sEW zt{kD7%!Hr;(C7is29GNtRYyhZ!uvcWIq}~26LQJzP+@SYaO9~7%uszWNA*RKio$Xg zjWX3A6>117RV=Dh9BR~Xc-1Y~t!_oF8ihJF8uhYkP-D=j#-c@~pjC~>IhBewHHKKF zQLsv<5H*P+RR%>V2lZFOXpqXJIF(IFYN~_MR4%zx9u=tDX})sNA~l_g)eKsuW|CXY zqV;Mvx&zpSo>yF^4yJ*yakC5bqT=yazr5J zxLZ0fcMIko!Q3mD`vmht!Q3yHwSsw2Fh3T|!-DyVU>+6BV}kjWV16x_-wNhY!E6xB z6N1?!n9YLuonSTy=J$emN-$3g<{7~}E0|vh=1+ooPB4GDirFTZ7XoEJ?Ak4;FufcSU4#a$a^i@oK51cw5dHP<=(D!4Go{J(q56krfDANm2 zp$k!|7o$oSp++x(S3i#3`U%wPCsC(Ypk8(j+KooN8ZG*1wCXiDr`MuQyNUI46s*@# zh+a>TdILr2=c&Jbj0Wj4iqqwkq&oEJ>Ak2c~+AcwZJ8NDlHIMdWq{IYNy)4Bgpxgsa4n`i|gc%%)IouOP+zZP&3}xIK z6&#I9?uRPwj~b4Hm*cUU6Hv=TQOAj>m)!{-fo2|wQ#=Yka}v(;ZD{8a)QyuVl*dvS zkE3W#p#eOeVt5F}avCM@BueHC2RV2$&EzRGmosT0XVJr)O-ne3R&Xvo&3RP9(*i(C zrRoDaKui5qFZD>(-42@SuX?7x>goSc^&k9IZ}nHb$zS!8zN(|wza__UU)|B{+mZ3@ zC>gWy4#K^usRz0Q4e8`A^Vsx>0o29mLOq#3Kql|QG~SPyd;oXzK|IWLSiy&|iRS5~sNZ=lFZH@o8M-ChE>-sVDzH z;rt`@<5n8TKha=5Msa+ehVlg(%k4=tnSZ5Oe2M1qWqOFO&?EdCE#*IGCI3ll_%ABu zzXPbtggV9(ozqdT(|-)+K0o=c(nM?3`#%?UdMnb3>eWk=tn& zAlp0$msyC}W)bpDAs#i0;WkC^m`AY9EWviO6xHT&c+D#8GEZTzS%W(B4C>9ZI4rwn zvkon01J0U_IB!bOZpv`UtfOF4PGQDF5#|LNU^Y{X*+Q{qCB>TxN;F$3#cY#Tzj>AJ zG?g^pyiSE?I~AKZXql;^Rb~gRHE+=-Qyp+_xtu$+BU$DCWR-h{WktE2{$yp7FIg_~ zB`e?m5vhhRSv%lMmKVNc?SwB`yL>5<&r0Wq1TDTDb@S~gr88OeSx;Weo&GPiw#$hW=msEvTzM#5wJVw)X^?RF5VZ4A6N0lVxl?6t#DXGfskj>KWv zHQP~Wv7>R;j=_1GjCMN?m+UACw&N+xPM`>zN(1afim_=FYvU>2Iw;Xjp%m*BW}8KK o+H9I{bEwefQnAgWW%hPjWnHw^PNz-wj_a6{{+G;!)7+8&0300e1ONa4 delta 2246 zcmd7S>r<6g7zOb4;NH*PgeijHg@YoZW8f7pfG7e75EMl4KH8MwXc{OrCZ-~4W|DG5 zPdeUB#akAJIF{uNqpYUVaU6?KiByziAWR*#>xMWdwf+FVt#{3ycjozhSohD+%`@~t ze4wi@B$@-1YflM`Xl9Y=_RR2Z#YY2^C?{I9My&8cqG*Fu(GKH9d!!2=%o7&aLYHQYll6rYtdrvc*_hF2=zP zz+reaT!39@Wxg8HZg_zjuR0szlM_ut(Z)2*5KA%GYmz`B4TiT#65}xd`%GdK;2PW; z(+*t68j}r}+M48wB6#9mlb*r_^Ur_MMMp>E=qMQDupeH~e#B$zWF)>>myGPX@c(U|%)Z*9>-*!M<*=Zy4;e2D`>!*Bb1)2JCu+eam3q zHrRIz_FaR0&tTs-*bfZ$Z;xTOeNtrzK&|S6g6@g z>SPWHxt!c&F13(vk+)ny?c_?b$l26U=2L)NL&4H+u;p4xmg{JeTu*6o15KA3DN}By zEV+fU^gK`$S^T2>sZ_wNulCgy(*Q!$`8GUBw0tA7)v&F&sG#5oWPqEaZw%105$$B@J)Fp5hsflncWKgE15#VYa3!wt71Z!m)NvJVaRs^Z4RYsd z^5mb%hi_5`uAxqRo&xw6dWLUN2>%*GR=z`{`7TZ7d-NjTr;9kWyhveiti zR+-qO=3u+Z!X7mjMQRZasUeRC{Qt z+Dog{zK5Xm4Rnxwk+q$@dW464zjax0S;Fi`546}{N$lc0vNW;bNbQbz-3rOt6JxX& zCTefY(ru8f+hVnDk4@SS+jS@G(f%mXfjFeQx(`m9?y~NSO5Gn-Is~;k z6!m%_ZtK3}rU#LS9!y?3f_(K5^3##jS$CtZI);LD9EItj=184DWA!jf(}^@gCsC#z dL0NhvEz~KrRHxD^J?gO|`#o~x;^et){{{^}