From d48c11400b11e58d6ee3a4f5d9c330dd1736f25c Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Thu, 10 Sep 2015 18:19:28 -0700 Subject: [PATCH] Fix style --- core/src/main/scala/org/apache/spark/SparkContext.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index bc9f7b8f09c91..58bb97a391293 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -27,7 +27,6 @@ import java.util.concurrent.atomic.{AtomicReference, AtomicBoolean, AtomicIntege import java.util.UUID.randomUUID import scala.collection.JavaConverters._ -import scala.collection.JavaConversions._ import scala.collection.{Map, Set} import scala.collection.generic.Growable import scala.collection.mutable.{HashMap, HashSet} @@ -353,10 +352,10 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli if (nonInheritedLocalProperties.nonEmpty) { // If there are properties that should not be inherited, filter them out val p = new Properties - val filtered = parent.filter { case (k, _) => + val filtered = parent.asScala.filter { case (k, _) => !nonInheritedLocalProperties.contains(k) } - p.putAll(filtered) + p.putAll(filtered.asJava) p } else { new Properties(parent)