diff options
| author | Sean Owen <sowen@cloudera.com> | 2016-05-18 14:22:21 -0700 |
|---|---|---|
| committer | Marcelo Vanzin <vanzin@cloudera.com> | 2016-05-18 14:22:21 -0700 |
| commit | 4768d037b77bcec1432a8fcc075a359619a2241d (patch) | |
| tree | 0ceca23e2c15c4c07493ade700dc7aeb8d32cf01 /common | |
| parent | e8b79afa024123f9d4ceaf0a1043a7e37d913a8d (diff) | |
| download | spark-4768d037b77bcec1432a8fcc075a359619a2241d.tar.gz spark-4768d037b77bcec1432a8fcc075a359619a2241d.tar.bz2 spark-4768d037b77bcec1432a8fcc075a359619a2241d.zip | |
[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 <sowen@cloudera.com>
Closes #13174 from srowen/SPARK-15386.
Diffstat (limited to 'common')
| -rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/JavaUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 eb534eed24..f3eaf22c01 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(); } } |