ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/RecursiveActionTest.java
(Generate patch)

Comparing jsr166/src/test/tck/RecursiveActionTest.java (file contents):
Revision 1.35 by jsr166, Sat Jun 25 06:54:53 2011 UTC vs.
Revision 1.36 by jsr166, Sun Jun 26 06:50:19 2011 UTC

# Line 1217 | Line 1217 | public class RecursiveActionTest extends
1217              Arrays.sort(array, lo, hi);
1218          }
1219          static void merge(long[] array, int lo, int mid, int hi) {
1220 <            int n = hi - lo;
1221 <            long[] buf = new long[n];
1222 <            int a = lo, b = mid;
1223 <            for (int i = 0; i < n; i++)
1224 <                buf[i] = (b == hi || (a < mid && array[a] < array[b])) ?
1225 <                    array[a++] : array[b++];
1226 <            System.arraycopy(buf, 0, array, lo, n);
1220 >            long[] buf = Arrays.copyOfRange(array, lo, mid);
1221 >            for (int i = 0, j = lo, k = mid; i < buf.length; j++)
1222 >                array[j] = (k == hi || buf[i] < array[k]) ?
1223 >                    buf[i++] : array[k++];
1224          }
1225      }
1226  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines