Skip to content
Snippets Groups Projects
Commit d1508dd9 authored by Marcelo Vanzin's avatar Marcelo Vanzin Committed by Andrew Or
Browse files

[SPARK-12386][CORE] Fix NPE when spark.executor.port is set.

Author: Marcelo Vanzin <vanzin@cloudera.com>

Closes #10339 from vanzin/SPARK-12386.
parent fdb38227
No related branches found
No related tags found
No related merge requests found
...@@ -256,7 +256,12 @@ object SparkEnv extends Logging { ...@@ -256,7 +256,12 @@ object SparkEnv extends Logging {
if (rpcEnv.isInstanceOf[AkkaRpcEnv]) { if (rpcEnv.isInstanceOf[AkkaRpcEnv]) {
rpcEnv.asInstanceOf[AkkaRpcEnv].actorSystem rpcEnv.asInstanceOf[AkkaRpcEnv].actorSystem
} else { } 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 // Create a ActorSystem for legacy codes
AkkaUtils.createActorSystem( AkkaUtils.createActorSystem(
actorSystemName + "ActorSystem", actorSystemName + "ActorSystem",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment