From d1508dd9b765489913bc948575a69ebab82f217b Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Wed, 16 Dec 2015 19:47:49 -0800
Subject: [PATCH] [SPARK-12386][CORE] Fix NPE when spark.executor.port is set.
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #10339 from vanzin/SPARK-12386.
---
core/src/main/scala/org/apache/spark/SparkEnv.scala | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
index 84230e32a4..52acde1b41 100644
--- a/core/src/main/scala/org/apache/spark/SparkEnv.scala
+++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -256,7 +256,12 @@ object SparkEnv extends Logging {
if (rpcEnv.isInstanceOf[AkkaRpcEnv]) {
rpcEnv.asInstanceOf[AkkaRpcEnv].actorSystem
} else {
- val actorSystemPort = if (port == 0) 0 else rpcEnv.address.port + 1
+ val actorSystemPort =
+ if (port == 0 || rpcEnv.address == null) {
+ port
+ } else {
+ rpcEnv.address.port + 1
+ }
// Create a ActorSystem for legacy codes
AkkaUtils.createActorSystem(
actorSystemName + "ActorSystem",
--
GitLab