diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java index 51b16304506..f6b8f10d87f 100644 --- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java +++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java @@ -2778,6 +2778,7 @@ public class ForkJoinPool extends AbstractExecutorService { @SuppressWarnings("serial") // Conditionally serializable volatile E result; final AtomicInteger count; // in case all throw + @SuppressWarnings("serial") final ForkJoinPool pool; // to check shutdown while collecting InvokeAnyRoot(int n, ForkJoinPool p) { pool = p; diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java index fc1bd07ea74..0fe3d12aaf3 100644 --- a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java +++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java @@ -1444,8 +1444,8 @@ public abstract class ForkJoinTask implements Future, Serializable { implements RunnableFuture { @SuppressWarnings("serial") // Conditionally serializable final Callable callable; - @SuppressWarnings("serial") // Conditionally serializable transient volatile Thread runner; + @SuppressWarnings("serial") // Conditionally serializable T result; AdaptedInterruptibleCallable(Callable callable) { if (callable == null) throw new NullPointerException();