aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-05-25 20:13:32 -0700
committerAaron Davidson <aaron@databricks.com>2014-05-25 20:13:32 -0700
commitb6d22af040073cd611b0fcfdf8a5259c0dfd854c (patch)
tree7ca9e6e1f4164634e506419a87a28e7760001707 /core
parentc3576ffcd7910e38928f233a824dd9e037cde05f (diff)
downloadspark-b6d22af040073cd611b0fcfdf8a5259c0dfd854c.tar.gz
spark-b6d22af040073cd611b0fcfdf8a5259c0dfd854c.tar.bz2
spark-b6d22af040073cd611b0fcfdf8a5259c0dfd854c.zip
HOTFIX: Add no-arg SparkContext constructor in Java
Self explanatory. Author: Patrick Wendell <pwendell@gmail.com> Closes #878 from pwendell/java-constructor and squashes the following commits: 2cc1605 [Patrick Wendell] HOTFIX: Add no-arg SparkContext constructor in Java
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala b/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala
index a7cfee6d01..1e0493c485 100644
--- a/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala
@@ -42,6 +42,12 @@ import org.apache.spark.rdd.RDD
*/
class JavaSparkContext(val sc: SparkContext) extends JavaSparkContextVarargsWorkaround {
/**
+ * Create a JavaSparkContext that loads settings from system properties (for instance, when
+ * launching with ./bin/spark-submit).
+ */
+ def this() = this(new SparkContext())
+
+ /**
* @param conf a [[org.apache.spark.SparkConf]] object specifying Spark parameters
*/
def this(conf: SparkConf) = this(new SparkContext(conf))