From 21047d923e4364023c556250c9f1cfbab6cc68ff Mon Sep 17 00:00:00 2001 From: Denny Date: Sat, 13 Oct 2012 13:44:24 -0700 Subject: Protect from setting null environment variables. --- core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'core/src/main') diff --git a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala index 303cbbda00..637e763c9e 100644 --- a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala +++ b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala @@ -116,7 +116,11 @@ private[spark] class ExecutorRunner( val builder = new ProcessBuilder(command: _*).directory(executorDir) val env = builder.environment() for ((key, value) <- jobDesc.command.environment) { - env.put(key, value) + if (value == null) { + logInfo("Environment variable not set: " + key) + } else { + env.put(key, value) + } } // In case we are running this from within the Spark Shell // so we are not creating a parent process. -- cgit v1.2.3