SQOOP-3375: HiveMiniCluster does not restore hive-site.xml location
(Szabolcs Vasas via Boglarka Egyed)
diff --git a/src/test/org/apache/sqoop/hive/minicluster/HiveMiniCluster.java b/src/test/org/apache/sqoop/hive/minicluster/HiveMiniCluster.java
index 19bb760..9dd5448 100644
--- a/src/test/org/apache/sqoop/hive/minicluster/HiveMiniCluster.java
+++ b/src/test/org/apache/sqoop/hive/minicluster/HiveMiniCluster.java
@@ -32,6 +32,7 @@
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.Socket;
+import java.net.URL;
import java.security.PrivilegedAction;
import java.util.Map;
import java.util.concurrent.TimeoutException;
@@ -56,6 +57,8 @@
private HiveConf config;
+ private URL originalHiveSiteLocation;
+
public HiveMiniCluster(AuthenticationConfiguration authenticationConfiguration) {
this(DEFAULT_HOST, DEFAULT_PORT, authenticationConfiguration);
}
@@ -102,6 +105,7 @@
config.writeXml(out);
}
+ originalHiveSiteLocation = HiveConf.getHiveSiteLocation();
HiveConf.setHiveSiteLocation(hiveSiteXmlFile.toURI().toURL());
}
@@ -118,7 +122,7 @@
public void stop() {
hiveServer2.stop();
- HiveConf.setHiveSiteLocation(null);
+ HiveConf.setHiveSiteLocation(originalHiveSiteLocation);
try {
FileUtils.deleteDirectory(new File(tempFolderPath));
} catch (IOException e) {
