Prevent open client leak

trinodb · Sep 25, 2019 · a520d7e · tooptoop4 · Sep 26, 2019 · a520d7e
1 parent 099121c
commit a520d7e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftHiveMetastore.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftHiveMetastore.java
@@ -1423,13 +1423,15 @@ private ThriftMetastoreClient createMetastoreClient()
     private ThriftMetastoreClient createMetastoreClient(HiveIdentity identity)
             throws TException
     {
-        ThriftMetastoreClient client = createMetastoreClient();
         if (!impersonationEnabled) {
-            return client;
+            return createMetastoreClient();
         }
 
-        setMetastoreUserOrClose(client, identity.getUsername()
-                .orElseThrow(() -> new IllegalStateException("End-user name should exist when metastore impersonation is enabled")));
+        String username = identity.getUsername()
+                .orElseThrow(() -> new IllegalStateException("End-user name should exist when metastore impersonation is enabled"));
+
+        ThriftMetastoreClient client = createMetastoreClient();
+        setMetastoreUserOrClose(client, username);
         return client;
     }