Index: shims/src/common/java/org/apache/hadoop/hive/thrift/TUGIContainingTransport.java =================================================================== --- shims/src/common/java/org/apache/hadoop/hive/thrift/TUGIContainingTransport.java (revision 1518884) +++ shims/src/common/java/org/apache/hadoop/hive/thrift/TUGIContainingTransport.java (working copy) @@ -79,11 +79,15 @@ */ @Override public TUGIContainingTransport getTransport(TTransport trans) { - + // UGI information is not available at connection setup time, it will be set later // via set_ugi() rpc. - transMap.putIfAbsent(trans, new TUGIContainingTransport(trans)); - return transMap.get(trans); + TUGIContainingTransport tugiTrans = transMap.get(trans); + if (tugiTrans == null) { + tugiTrans = new TUGIContainingTransport(trans); + transMap.putIfAbsent(trans, tugiTrans); + } + return tugiTrans; } } }