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

Comparing jsr166/src/test/loops/BinaryAsyncAction.java (file contents):
Revision 1.1 by dl, Sun Sep 19 12:55:36 2010 UTC vs.
Revision 1.5 by jsr166, Sat Jan 28 04:41:18 2012 UTC

# Line 101 | Line 101 | public abstract class BinaryAsyncAction
101       * Overridable callback action triggered upon <tt>complete</tt> of
102       * subtasks.  Upon invocation, both subtasks have completed.
103       * After return, this task <tt>isDone</tt> and is joinable by
104 <     * other tasks. The default version of this method does
105 <     * nothing. But it may may be overridden in subclasses to perform
106 <     * some action (for example a reduction) when this task is
107 <     * completes.
104 >     * other tasks. The default version of this method does nothing.
105 >     * But it may be overridden in subclasses to perform some action
106 >     * (for example a reduction) when this task is completes.
107       * @param x one subtask
108       * @param y the other subtask
109       */
# Line 174 | Line 173 | public abstract class BinaryAsyncAction
173                  break;
174              try {
175                  p.onComplete(a, s);
176 <            } catch(Throwable rex) {
176 >            } catch (Throwable rex) {
177                  p.completeExceptionally(rex);
178                  return;
179              }
# Line 251 | Line 250 | public abstract class BinaryAsyncAction
250       * @param update the new value
251       * @return true if successful
252       */
253 <    protected final boolean compareAndSetControlState(int expect,
253 >    protected final boolean compareAndSetControlState(int expect,
254                                                        int update) {
255          return controlStateUpdater.compareAndSet(this, expect, update);
256      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines