Repository: spark Updated Branches: refs/heads/branch-1.0 a3976a272 -> 18c77cb53
HOTFIX: Add no-arg SparkContext constructor in Java Self explanatory. Author: Patrick Wendell <pwend...@gmail.com> Closes #878 from pwendell/java-constructor and squashes the following commits: 2cc1605 [Patrick Wendell] HOTFIX: Add no-arg SparkContext constructor in Java (cherry picked from commit b6d22af040073cd611b0fcfdf8a5259c0dfd854c) Signed-off-by: Aaron Davidson <aa...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/18c77cb5 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/18c77cb5 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/18c77cb5 Branch: refs/heads/branch-1.0 Commit: 18c77cb533a2b7b2b9b8447009e31259caa2194b Parents: a3976a2 Author: Patrick Wendell <pwend...@gmail.com> Authored: Sun May 25 20:13:32 2014 -0700 Committer: Aaron Davidson <aa...@databricks.com> Committed: Sun May 25 20:13:46 2014 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/api/java/JavaSparkContext.scala | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/18c77cb5/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala ---------------------------------------------------------------------- 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 a7cfee6..1e0493c 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))
