You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by da...@apache.org on 2015/12/01 00:42:21 UTC
spark git commit: fix Maven build
Repository: spark
Updated Branches:
refs/heads/master 553588893 -> ecc00ec3f
fix Maven build
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ecc00ec3
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ecc00ec3
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ecc00ec3
Branch: refs/heads/master
Commit: ecc00ec3faf09b0e21bc4b468cb45e45d05cf482
Parents: 5535888
Author: Davies Liu <da...@gmail.com>
Authored: Mon Nov 30 15:42:10 2015 -0800
Committer: Davies Liu <da...@gmail.com>
Committed: Mon Nov 30 15:42:10 2015 -0800
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ecc00ec3/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala
index 507641f..a781777 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala
@@ -43,7 +43,7 @@ abstract class SparkPlan extends QueryPlan[SparkPlan] with Logging with Serializ
* populated by the query planning infrastructure.
*/
@transient
- protected[spark] final val sqlContext = SQLContext.getActive().get
+ protected[spark] final val sqlContext = SQLContext.getActive().getOrElse(null)
protected def sparkContext = sqlContext.sparkContext
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org