You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/08/12 05:10:18 UTC

git commit: [sql]use SparkSQLEnv.stop() in ShutdownHook

Repository: spark
Updated Branches:
  refs/heads/master 21a95ef05 -> e83fdcd42


[sql]use SparkSQLEnv.stop() in ShutdownHook

Author: wangfei <wa...@huawei.com>

Closes #1852 from scwf/patch-3 and squashes the following commits:

ae28c29 [wangfei] use SparkSQLEnv.stop() in ShutdownHook


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e83fdcd4
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e83fdcd4
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e83fdcd4

Branch: refs/heads/master
Commit: e83fdcd421d132812411eb805565b76f087f1bc0
Parents: 21a95ef
Author: wangfei <wa...@huawei.com>
Authored: Mon Aug 11 20:10:13 2014 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Mon Aug 11 20:10:13 2014 -0700

----------------------------------------------------------------------
 .../org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/e83fdcd4/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
----------------------------------------------------------------------
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
index 6f7942a..cadf7aa 100644
--- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
+++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
@@ -60,7 +60,7 @@ private[hive] object HiveThriftServer2 extends Logging {
     Runtime.getRuntime.addShutdownHook(
       new Thread() {
         override def run() {
-          SparkSQLEnv.sparkContext.stop()
+          SparkSQLEnv.stop()
         }
       }
     )


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org