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

[vanzin]

No description provided.

[zsxwing]

could you use port directly here since rpcEnv doesn't use it in this case?

[zsxwing]

LGTM pending tests

[SparkQA]

Test build #47862 has finished for PR 10339 at commit 6911a2b.

• This patch fails Spark unit tests.
• This patch merges cleanly.
• This patch adds no public classes.

[markhamstra]

I don't know... it's longer than the one-liner I was told to expect. :)

[zsxwing]

retest this please

[vanzin]

it's longer than the one-liner

I deleted just one line!

[vanzin]

retest this please

[andrewor14]

@markhamstra @vanzin we can make this a real oneliner if we use Option :)

val actorSystemPort = if (port == 0) 0 else Option(rpcEnv.address).map(_.port + 1).getOrElse(port)

not sure if that's easier or harder to read. Either way is fine.

[zsxwing]

It's simpler: val actorSystemPort = if (port == 0 || rpcEnv.address == null) port else rpcEnv.address.port + 1

[andrewor14]

+1 to @zsxwing

[vanzin]

Still doesn't fit in one line, though. But it's simpler.

[andrewor14]

LGTM

[SparkQA]

Test build #47867 has finished for PR 10339 at commit e1e67af.

• This patch fails Spark unit tests.
• This patch merges cleanly.
• This patch adds no public classes.

[vanzin]

flakiness? retest this please

[SparkQA]

Test build #47874 has finished for PR 10339 at commit e1e67af.

• This patch fails Spark unit tests.
• This patch merges cleanly.
• This patch adds no public classes.

[SparkQA]

Test build #47872 has finished for PR 10339 at commit e1e67af.

• This patch passes all tests.
• This patch merges cleanly.
• This patch adds no public classes.

[andrewor14]

Merging into master 1.6 thanks!

[SparkQA]

Test build #47881 has finished for PR 10339 at commit e1e67af.

• This patch passes all tests.
• This patch merges cleanly.
• This patch adds no public classes.

[SparkQA]

Test build #47885 has finished for PR 10339 at commit a1727ab.

• This patch fails Spark unit tests.
• This patch merges cleanly.
• This patch adds no public classes.