aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-11-09 11:55:16 -0800
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-11-09 11:55:16 -0800
commit72a601ec318d017e5ec2b878abeac19e30ebb554 (patch)
tree1b8fc58bc713e272c88d9d46a1704e34f92c097e /core
parentdd63c548c228d7775670e4664be18ebd1c62bed7 (diff)
parent319299941dbf4bfa2aaa8b5078e313ca45cb5207 (diff)
downloadspark-72a601ec318d017e5ec2b878abeac19e30ebb554.tar.gz
spark-72a601ec318d017e5ec2b878abeac19e30ebb554.tar.bz2
spark-72a601ec318d017e5ec2b878abeac19e30ebb554.zip
Merge pull request #152 from rxin/repl
Propagate SparkContext local properties from spark-repl caller thread to the repl execution thread.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/SparkContext.scala6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index 4a98491460..dbb354d3b7 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -280,6 +280,12 @@ class SparkContext(
override protected def childValue(parent: Properties): Properties = new Properties(parent)
}
+ private[spark] def getLocalProperties(): Properties = localProperties.get()
+
+ private[spark] def setLocalProperties(props: Properties) {
+ localProperties.set(props)
+ }
+
def initLocalProperties() {
localProperties.set(new Properties())
}