clean

yaooqinn · yaooqinn · commit f9ea941c04d2 · 2020-06-16T00:18:50.000+08:00
diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/SharedThriftServer.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/SharedThriftServer.scala
@@ -111,7 +111,11 @@ trait SharedThriftServer extends SharedSparkSession {
         logError("Error start hive server with Context ", e)
         if (hiveServer2 != null) {
           hiveServer2.stop()
+          hiveServer2 = null
         }
+        SessionState.detachSession()
+        Hive.closeCurrent()
+        throw e
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,11 @@ trait SharedThriftServer extends SharedSparkSession {`
`111`	`111`	`logError("Error start hive server with Context ", e)`
`112`	`112`	`if (hiveServer2 != null) {`
`113`	`113`	`hiveServer2.stop()`
	`114`	`+ hiveServer2 = null`
`114`	`115`	`}`
	`116`	`+ SessionState.detachSession()`
	`117`	`+ Hive.closeCurrent()`
	`118`	`+ throw e`
`115`	`119`	`}`
`116`	`120`	`}`
`117`	`121`	`}`