Repository: hadoop Updated Branches: refs/heads/branch-2 a373094bf -> 2b04ae918
HADOOP-14966. Handle JDK-8071638 for hadoop-common. Contributed by Bibin A Chundatt. (cherry picked from commit 6b8122458ede9ececb138bed99d368580e5439a1) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2b04ae91 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2b04ae91 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2b04ae91 Branch: refs/heads/branch-2 Commit: 2b04ae918cfe02290c800e0af12c2746bf1cbc1c Parents: a373094 Author: Naganarasimha <[email protected]> Authored: Mon Oct 23 23:41:38 2017 +0530 Committer: Naganarasimha <[email protected]> Committed: Mon Oct 23 23:47:33 2017 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/util/concurrent/ExecutorHelper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b04ae91/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/ExecutorHelper.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/ExecutorHelper.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/ExecutorHelper.java index 5f22f93..caa2584 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/ExecutorHelper.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/ExecutorHelper.java @@ -40,14 +40,16 @@ public final class ExecutorHelper { //For additional information, see: https://docs.oracle // .com/javase/7/docs/api/java/util/concurrent/ThreadPoolExecutor - // .html#afterExecute(java.lang.Runnable,%20java.lang.Throwable) . + // .html#afterExecute(java.lang.Runnable,%20java.lang.Throwable) - if (t == null && r instanceof Future<?>) { + // Handle JDK-8071638 + if (t == null && r instanceof Future<?> && ((Future<?>) r).isDone()) { try { ((Future<?>) r).get(); } catch (ExecutionException ee) { - LOG.warn("Execution exception when running task in " + - Thread.currentThread().getName()); + LOG.warn( + "Execution exception when running task in " + Thread.currentThread() + .getName()); t = ee.getCause(); } catch (InterruptedException ie) { LOG.warn("Thread (" + Thread.currentThread() + ") interrupted: ", ie); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
