Repository: spark Updated Branches: refs/heads/master e8b79afa0 -> 4768d037b
[SPARK-15386][CORE] Master doesn't compile against Java 1.7 / Process.isAlive ## What changes were proposed in this pull request? Remove call to Process.isAlive -- Java 8 only. Introduced in https://github.com/apache/spark/pull/13042 / SPARK-15263 ## How was this patch tested? Jenkins tests Author: Sean Owen <[email protected]> Closes #13174 from srowen/SPARK-15386. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4768d037 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4768d037 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4768d037 Branch: refs/heads/master Commit: 4768d037b77bcec1432a8fcc075a359619a2241d Parents: e8b79af Author: Sean Owen <[email protected]> Authored: Wed May 18 14:22:21 2016 -0700 Committer: Marcelo Vanzin <[email protected]> Committed: Wed May 18 14:22:21 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/spark/network/util/JavaUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/4768d037/common/network-common/src/main/java/org/apache/spark/network/util/JavaUtils.java ---------------------------------------------------------------------- diff --git a/common/network-common/src/main/java/org/apache/spark/network/util/JavaUtils.java b/common/network-common/src/main/java/org/apache/spark/network/util/JavaUtils.java index eb534ee..f3eaf22 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/util/JavaUtils.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/JavaUtils.java @@ -144,7 +144,7 @@ public class JavaUtils { } catch (Exception e) { throw new IOException("Failed to delete: " + file.getAbsolutePath(), e); } finally { - if (process != null && process.isAlive()) { + if (process != null) { process.destroy(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
