Address the comments

apache · Jan 29, 2018 · e5f4b58 · e5f4b58
1 parent 1ed62ef
commit e5f4b58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python/pyspark/context.py b/python/pyspark/context.py
@@ -400,8 +400,6 @@ def stop(self):
         """
         if getattr(self, "_jsc", None):
             try:
-                # We should clean the default session up. See SPARK-23228.
-                self._jvm.SparkSession.clearDefaultSession()
                 self._jsc.stop()
             except Py4JError:
                 # Case: SPARK-18523

diff --git a/python/pyspark/sql/session.py b/python/pyspark/sql/session.py
@@ -767,6 +767,8 @@ def stop(self):
         """Stop the underlying :class:`SparkContext`.
         """
         self._sc.stop()
+        # We should clean the default session up. See SPARK-23228.
+        self._jvm.SparkSession.clearDefaultSession()
         SparkSession._instantiatedSession = None
 
     @since(2.0)