Fix metastore tunnel creation when hive configuration properties are …

…not set (#210)
ExpediaGroup · Mar 4, 2021 · 8426e45 · 8426e45
1 parent e2b3bce
commit 8426e45
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [3.9.1] - TBD
+### Fixed
+* Null pointer exception when creating a metastore tunnel by adding a check for null `configuration-properties`.
+
 ## [3.9.0] - 2021-02-26
 ### Added
 * Support for setting Hive metastore filter hooks which can be configured per federated metastore. See the [README](https://github.com/HotelsDotCom/waggle-dance#federation) for more information.

diff --git a/...in/java/com/hotels/bdp/waggledance/client/tunnelling/TunnelingMetaStoreClientFactory.java b/...in/java/com/hotels/bdp/waggledance/client/tunnelling/TunnelingMetaStoreClientFactory.java
@@ -78,7 +78,9 @@ public CloseableThriftHiveMetastoreIface newInstance(
 
     Map<String, String> properties = new HashMap<>();
     properties.put(ConfVars.METASTOREURIS.varname, uri);
+    if (configurationProperties != null) {
     properties.putAll(configurationProperties);
+    }
     HiveConfFactory confFactory = new HiveConfFactory(Collections.<String>emptyList(), properties);
     HiveConf localHiveConf = localHiveConfFactory.newInstance(localHost, localPort, confFactory.newInstance());
 

diff --git a/...ava/com/hotels/bdp/waggledance/client/tunnelling/TunnelingMetaStoreClientFactoryTest.java b/...ava/com/hotels/bdp/waggledance/client/tunnelling/TunnelingMetaStoreClientFactoryTest.java
@@ -103,6 +103,12 @@ public void newInstance() {
     assertThat(tunnelable, is(hiveMetaStoreClientSupplier));
   }
 
+  @Test
+  public void newInstanceNullConfigurationProperties() {
+    tunnelingMetaStoreClientFactory.newInstance(METASTORE_URI, metastoreTunnel, NAME, RECONNECTION_RETRIES,
+        CONNECTION_TIMEOUT, null);
+  }
+
   @Test
   public void newInstanceMultipleUris() {
     String metastoreUris = METASTORE_URI + ",thrift://metastore-host2:43";