--- jsr166/src/main/java/util/ArrayPrefixHelpers.java	2013/01/16 19:01:22	1.1
+++ jsr166/src/main/java/util/ArrayPrefixHelpers.java	2015/09/20 17:42:24	1.9
@@ -5,12 +5,13 @@
  */
 
 package java.util;
-import java.util.concurrent.ForkJoinPool;
+
 import java.util.concurrent.CountedCompleter;
+import java.util.concurrent.ForkJoinPool;
 import java.util.function.BinaryOperator;
+import java.util.function.DoubleBinaryOperator;
 import java.util.function.IntBinaryOperator;
 import java.util.function.LongBinaryOperator;
-import java.util.function.DoubleBinaryOperator;
 
 /**
  * ForkJoin tasks to perform Arrays.parallelPrefix operations.
@@ -19,7 +20,7 @@ import java.util.function.DoubleBinaryOp
  * @since 1.8
  */
 class ArrayPrefixHelpers {
-    private ArrayPrefixHelpers() {}; // non-instantiable
+    private ArrayPrefixHelpers() {} // non-instantiable
 
     /*
      * Parallel prefix (aka cumulate, scan) task classes
@@ -187,7 +188,9 @@ class ArrayPrefixHelpers {
                         sum = t.in;
                     t.out = sum;
                     for (CumulateTask<T> par;;) {             // propagate
-                        if ((par = (CumulateTask<T>)t.getCompleter()) == null) {
+                        @SuppressWarnings("unchecked") CumulateTask<T> partmp
+                            = (CumulateTask<T>)t.getCompleter();
+                        if ((par = partmp) == null) {
                             if ((state & FINISHED) != 0)      // enable join
                                 t.quietlyComplete();
                             break outer;
@@ -381,8 +384,8 @@ class ArrayPrefixHelpers {
 
         /** Root task constructor */
         public DoubleCumulateTask(DoubleCumulateTask parent,
-                                DoubleBinaryOperator function,
-                                double[] array, int lo, int hi) {
+                                  DoubleBinaryOperator function,
+                                  double[] array, int lo, int hi) {
             super(parent);
             this.function = function; this.array = array;
             this.lo = this.origin = lo; this.hi = this.fence = hi;
@@ -394,8 +397,8 @@ class ArrayPrefixHelpers {
 
         /** Subtask constructor */
         DoubleCumulateTask(DoubleCumulateTask parent, DoubleBinaryOperator function,
-                         double[] array, int origin, int fence, int threshold,
-                         int lo, int hi) {
+                           double[] array, int origin, int fence, int threshold,
+                           int lo, int hi) {
             super(parent);
             this.function = function; this.array = array;
             this.origin = origin; this.fence = fence;
@@ -531,8 +534,8 @@ class ArrayPrefixHelpers {
 
         /** Root task constructor */
         public IntCumulateTask(IntCumulateTask parent,
-                                IntBinaryOperator function,
-                                int[] array, int lo, int hi) {
+                               IntBinaryOperator function,
+                               int[] array, int lo, int hi) {
             super(parent);
             this.function = function; this.array = array;
             this.lo = this.origin = lo; this.hi = this.fence = hi;
@@ -544,8 +547,8 @@ class ArrayPrefixHelpers {
 
         /** Subtask constructor */
         IntCumulateTask(IntCumulateTask parent, IntBinaryOperator function,
-                         int[] array, int origin, int fence, int threshold,
-                         int lo, int hi) {
+                        int[] array, int origin, int fence, int threshold,
+                        int lo, int hi) {
             super(parent);
             this.function = function; this.array = array;
             this.origin = origin; this.fence = fence;