Index: metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java =================================================================== --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (revision 1126481) +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (working copy) @@ -261,15 +261,15 @@ if ((transport != null) && transport.isOpen()) { transport.close(); } - if (standAloneClient) { - try { + try { + if (null != client) { client.shutdown(); - } catch (TException e) { - // TODO:pc cleanup the exceptions - LOG.error("Unable to shutdown local metastore client"); - LOG.error(e.getStackTrace()); - // throw new RuntimeException(e.getMessage()); } + } catch (TException e) { + // TODO:pc cleanup the exceptions + LOG.error("Unable to shutdown local metastore client"); + LOG.error(e.getStackTrace()); + // throw new RuntimeException(e.getMessage()); } } @@ -1064,7 +1064,7 @@ String owner = conf.getUser(); return getDelegationToken(owner, renewerKerberosPrincipalName); } - + @Override public String getDelegationToken(String owner, String renewerKerberosPrincipalName) throws MetaException, TException { Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (revision 1126481) +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (working copy) @@ -192,6 +192,7 @@ if (metaStoreClient != null) { metaStoreClient.close(); } + metaStoreClient=null; } /**