Index: cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java =================================================================== --- cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java (revision 1082608) +++ cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java (working copy) @@ -95,6 +95,7 @@ // if we have come this far - either the previous commands // are all successful or this is command line. in either case // this counts as a successful run + ss.close(); System.exit(0); } else if (tokens[0].equalsIgnoreCase("source")) { Index: cli/src/java/org/apache/hadoop/hive/cli/CliSessionState.java =================================================================== --- cli/src/java/org/apache/hadoop/hive/cli/CliSessionState.java (revision 1082608) +++ cli/src/java/org/apache/hadoop/hive/cli/CliSessionState.java (working copy) @@ -103,9 +103,10 @@ public void close() { try { - client.clean(); - client.shutdown(); - transport.close(); + if (remoteMode) { + client.clean(); + transport.close(); + } } catch (TException e) { e.printStackTrace(); }