diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java index 0058cd3..f62d0ad 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java @@ -50,10 +50,10 @@ private static final String HS2_BINARY_AUTH_MODE = "NONE"; private static final String HS2_HTTP_AUTH_MODE = "NOSASL"; - private MiniHS2 miniHS2 = null; - private static HiveConf conf = new HiveConf(); - private Connection hs2Conn = null; - private String dataFileDir = conf.get("test.data.files"); + private MiniHS2 miniHS2; + private HiveConf conf; + private Connection hs2Conn; + private String dataFileDir; private Map confOverlay; private final String SSL_CONN_PARAMS = ";ssl=true;sslTrustStore=" + dataFileDir + File.separator + TRUST_STORE_NAME + ";trustStorePassword=" + KEY_STORE_PASSWORD; @@ -65,8 +65,11 @@ public static void beforeTest() throws Exception { @Before public void setUp() throws Exception { + conf = new HiveConf(); DriverManager.setLoginTimeout(0); - if (!System.getProperty("test.data.files", "").isEmpty()) { + if (System.getProperty("test.data.files", "").isEmpty()) { + dataFileDir = conf.get("test.data.files"); + } else { dataFileDir = System.getProperty("test.data.files"); } dataFileDir = dataFileDir.replace('\\', '/').replace("c:", "");