Repository: spark
Updated Branches:
  refs/heads/master d22fc1088 -> 64e555110


[SPARK-11672][ML] set active SQLContext in JavaDefaultReadWriteSuite

The same as #9694, but for Java test suite. yhuai

Author: Xiangrui Meng <m...@databricks.com>

Closes #9719 from mengxr/SPARK-11672.4.


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

Branch: refs/heads/master
Commit: 64e55511033afb6ef42be142eb371bfbc31f5230
Parents: d22fc10
Author: Xiangrui Meng <m...@databricks.com>
Authored: Sun Nov 15 13:23:05 2015 -0800
Committer: Yin Huai <yh...@databricks.com>
Committed: Sun Nov 15 13:23:05 2015 -0800

----------------------------------------------------------------------
 .../org/apache/spark/ml/util/JavaDefaultReadWriteSuite.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/64e55511/mllib/src/test/java/org/apache/spark/ml/util/JavaDefaultReadWriteSuite.java
----------------------------------------------------------------------
diff --git 
a/mllib/src/test/java/org/apache/spark/ml/util/JavaDefaultReadWriteSuite.java 
b/mllib/src/test/java/org/apache/spark/ml/util/JavaDefaultReadWriteSuite.java
index c395380..01ff1ea 100644
--- 
a/mllib/src/test/java/org/apache/spark/ml/util/JavaDefaultReadWriteSuite.java
+++ 
b/mllib/src/test/java/org/apache/spark/ml/util/JavaDefaultReadWriteSuite.java
@@ -32,17 +32,23 @@ import org.apache.spark.util.Utils;
 public class JavaDefaultReadWriteSuite {
 
   JavaSparkContext jsc = null;
+  SQLContext sqlContext = null;
   File tempDir = null;
 
   @Before
   public void setUp() {
     jsc = new JavaSparkContext("local[2]", "JavaDefaultReadWriteSuite");
+    SQLContext.clearActive();
+    sqlContext = new SQLContext(jsc);
+    SQLContext.setActive(sqlContext);
     tempDir = Utils.createTempDir(
       System.getProperty("java.io.tmpdir"), "JavaDefaultReadWriteSuite");
   }
 
   @After
   public void tearDown() {
+    sqlContext = null;
+    SQLContext.clearActive();
     if (jsc != null) {
       jsc.stop();
       jsc = null;
@@ -64,7 +70,6 @@ public class JavaDefaultReadWriteSuite {
     } catch (IOException e) {
       // expected
     }
-    SQLContext sqlContext = new SQLContext(jsc);
     instance.write().context(sqlContext).overwrite().save(outputPath);
     MyParams newInstance = MyParams.load(outputPath);
     Assert.assertEquals("UID should match.", instance.uid(), 
newInstance.uid());


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

Reply via email to