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

Author: Marcelo Vanzin <[email protected]>

Closes #10339 from vanzin/SPARK-12386.

Author: Marcelo Vanzin

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",