--- jsr166/src/jsr166y/ForkJoinTask.java	2009/07/25 15:50:57	1.18
+++ jsr166/src/jsr166y/ForkJoinTask.java	2009/07/26 17:33:37	1.22
@@ -493,7 +493,7 @@ public abstract class ForkJoinTask<V> im
      * #inForkJoinPool}). Attempts to invoke in other contexts result
      * in exceptions or errors, possibly including ClassCastException.
      *
-     * @return <code>this</code>, to simplify usage.
+     * @return {@code this}, to simplify usage.
      */
     public final ForkJoinTask<V> fork() {
         ((ForkJoinWorkerThread) Thread.currentThread())
@@ -606,13 +606,14 @@ public abstract class ForkJoinTask<V> im
      * in exceptions or errors, possibly including ClassCastException.
      *
      * @param tasks the collection of tasks
+     * @return the tasks argument, to simplify usage
      * @throws NullPointerException if tasks or any element are null
      * @throws RuntimeException or Error if any task did so
      */
-    public static void invokeAll(Collection<? extends ForkJoinTask<?>> tasks) {
+    public static <T extends ForkJoinTask<?>> Collection<T> invokeAll(Collection<T> tasks) {
         if (!(tasks instanceof List<?>)) {
             invokeAll(tasks.toArray(new ForkJoinTask<?>[tasks.size()]));
-            return;
+            return tasks;
         }
         @SuppressWarnings("unchecked")
         List<? extends ForkJoinTask<?>> ts =
@@ -647,6 +648,7 @@ public abstract class ForkJoinTask<V> im
         }
         if (ex != null)
             rethrowException(ex);
+        return tasks;
     }
 
     /**
@@ -1040,9 +1042,9 @@ public abstract class ForkJoinTask<V> im
     // adaptors
 
     /**
-     * Returns a new ForkJoinTask that performs the <code>run</code>
+     * Returns a new ForkJoinTask that performs the {@code run}
      * method of the given Runnable as its action, and returns a null
-     * result upon <code>join</code>.
+     * result upon {@code join}.
      *
      * @param runnable the runnable action
      * @return the task
@@ -1052,9 +1054,9 @@ public abstract class ForkJoinTask<V> im
     }
 
     /**
-     * Returns a new ForkJoinTask that performs the <code>run</code>
+     * Returns a new ForkJoinTask that performs the {@code run}
      * method of the given Runnable as its action, and returns the
-     * given result upon <code>join</code>.
+     * given result upon {@code join}.
      *
      * @param runnable the runnable action
      * @param result the result upon completion
@@ -1065,10 +1067,10 @@ public abstract class ForkJoinTask<V> im
     }
 
     /**
-     * Returns a new ForkJoinTask that performs the <code>call</code>
+     * Returns a new ForkJoinTask that performs the {@code call}
      * method of the given Callable as its action, and returns its
-     * result upon <code>join</code>, translating any checked 
-     * exceptions encountered into <code>RuntimeException<code>.
+     * result upon {@code join}, translating any checked
+     * exceptions encountered into {@code RuntimeException}.
      *
      * @param callable the callable action
      * @return the task
@@ -1109,16 +1111,43 @@ public abstract class ForkJoinTask<V> im
             setDoneExceptionally((Throwable) ex);
     }
 
-    // Unsafe mechanics for jsr166y 3rd party package.
+    // Unsafe mechanics
+
+    private static final sun.misc.Unsafe UNSAFE = getUnsafe();
+    private static final long statusOffset =
+        objectFieldOffset("status", ForkJoinTask.class);
+
+    private static long objectFieldOffset(String field, Class<?> klazz) {
+        try {
+            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));
+        } catch (NoSuchFieldException e) {
+            // Convert Exception to corresponding Error
+            NoSuchFieldError error = new NoSuchFieldError(field);
+            error.initCause(e);
+            throw error;
+        }
+    }
+
+    /**
+     * Returns a sun.misc.Unsafe.  Suitable for use in a 3rd party package.
+     * Replace with a simple call to Unsafe.getUnsafe when integrating
+     * into a jdk.
+     *
+     * @return a sun.misc.Unsafe
+     */
     private static sun.misc.Unsafe getUnsafe() {
         try {
             return sun.misc.Unsafe.getUnsafe();
         } catch (SecurityException se) {
             try {
                 return java.security.AccessController.doPrivileged
-                    (new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
+                    (new java.security
+                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
                         public sun.misc.Unsafe run() throws Exception {
-                            return getUnsafeByReflection();
+                            java.lang.reflect.Field f = sun.misc
+                                .Unsafe.class.getDeclaredField("theUnsafe");
+                            f.setAccessible(true);
+                            return (sun.misc.Unsafe) f.get(null);
                         }});
             } catch (java.security.PrivilegedActionException e) {
                 throw new RuntimeException("Could not initialize intrinsics",
@@ -1126,28 +1155,4 @@ public abstract class ForkJoinTask<V> im
             }
         }
     }
-
-    private static sun.misc.Unsafe getUnsafeByReflection()
-            throws NoSuchFieldException, IllegalAccessException {
-        java.lang.reflect.Field f =
-            sun.misc.Unsafe.class.getDeclaredField("theUnsafe");
-        f.setAccessible(true);
-        return (sun.misc.Unsafe) f.get(null);
-    }
-
-    private static long fieldOffset(String fieldName, Class<?> klazz) {
-        try {
-            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(fieldName));
-        } catch (NoSuchFieldException e) {
-            // Convert Exception to Error
-            NoSuchFieldError error = new NoSuchFieldError(fieldName);
-            error.initCause(e);
-            throw error;
-        }
-    }
-
-    private static final sun.misc.Unsafe UNSAFE = getUnsafe();
-    static final long statusOffset =
-        fieldOffset("status", ForkJoinTask.class);
-
 }