OOZIE-1457 Amendment, fixing testcase issue with MiniHS2
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/45d69795 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/45d69795 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/45d69795 Branch: refs/remotes/trunk Commit: 45d6979531ef37c96d3f20d6ba382aaa983c6129 Parents: 4ca8678 Author: Robert Kanter <[email protected]> Authored: Fri Sep 12 14:44:29 2014 -0700 Committer: Robert Kanter <[email protected]> Committed: Fri Sep 12 14:44:29 2014 -0700 ---------------------------------------------------------------------- core/src/test/java/org/apache/oozie/test/XTestCase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/45d69795/core/src/test/java/org/apache/oozie/test/XTestCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java b/core/src/test/java/org/apache/oozie/test/XTestCase.java index 09631e0..27cbdc9 100644 --- a/core/src/test/java/org/apache/oozie/test/XTestCase.java +++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java @@ -414,8 +414,9 @@ public abstract class XTestCase extends TestCase { */ @Override protected void tearDown() throws Exception { - if (hiveserver2 != null) { + if (hiveserver2 != null && hiveserver2.isStarted()) { hiveserver2.stop(); + hiveserver2 = null; } resetSystemProperties(); sysProps = null;
