Repository: spark Updated Branches: refs/heads/master 303c1201c -> ec9b62164
SPARK-9070 JavaDataFrameSuite teardown NPEs if setup failed fix teardown to skip table delete if hive context is null Author: Steve Loughran <[email protected]> Closes #7425 from steveloughran/stevel/patches/SPARK-9070-JavaDataFrameSuite-NPE and squashes the following commits: 1982d38 [Steve Loughran] SPARK-9070 JavaDataFrameSuite teardown NPEs if setup failed Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ec9b6216 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ec9b6216 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ec9b6216 Branch: refs/heads/master Commit: ec9b621647b893abae3afef219bceab382b99564 Parents: 303c120 Author: Steve Loughran <[email protected]> Authored: Wed Jul 15 12:15:35 2015 -0700 Committer: Reynold Xin <[email protected]> Committed: Wed Jul 15 12:15:35 2015 -0700 ---------------------------------------------------------------------- .../java/test/org/apache/spark/sql/hive/JavaDataFrameSuite.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ec9b6216/sql/hive/src/test/java/test/org/apache/spark/sql/hive/JavaDataFrameSuite.java ---------------------------------------------------------------------- diff --git a/sql/hive/src/test/java/test/org/apache/spark/sql/hive/JavaDataFrameSuite.java b/sql/hive/src/test/java/test/org/apache/spark/sql/hive/JavaDataFrameSuite.java index c4828c4..741a3cd 100644 --- a/sql/hive/src/test/java/test/org/apache/spark/sql/hive/JavaDataFrameSuite.java +++ b/sql/hive/src/test/java/test/org/apache/spark/sql/hive/JavaDataFrameSuite.java @@ -61,7 +61,9 @@ public class JavaDataFrameSuite { @After public void tearDown() throws IOException { // Clean up tables. - hc.sql("DROP TABLE IF EXISTS window_table"); + if (hc != null) { + hc.sql("DROP TABLE IF EXISTS window_table"); + } } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
