diff --git a/beeline/src/java/org/apache/hive/beeline/Commands.java b/beeline/src/java/org/apache/hive/beeline/Commands.java index 44dd18b..745f694 100644 --- a/beeline/src/java/org/apache/hive/beeline/Commands.java +++ b/beeline/src/java/org/apache/hive/beeline/Commands.java @@ -1226,11 +1226,11 @@ public boolean close(String line) { return false; } try { - if (beeLine.getDatabaseConnection().getConnection() != null - && !(beeLine.getDatabaseConnection().getConnection().isClosed())) { + if (beeLine.getDatabaseConnection().getCurrentConnection() != null + && !(beeLine.getDatabaseConnection().getCurrentConnection().isClosed())) { int index = beeLine.getDatabaseConnections().getIndex(); beeLine.info(beeLine.loc("closing", index, beeLine.getDatabaseConnection())); - beeLine.getDatabaseConnection().getConnection().close(); + beeLine.getDatabaseConnection().getCurrentConnection().close(); } else { beeLine.info(beeLine.loc("already-closed")); } diff --git a/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java b/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java index e349a49..791fec6 100644 --- a/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java +++ b/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java @@ -201,7 +201,6 @@ public Connection getConnectionFromLocalDriver(String url, Properties properties return null; } - public Connection getConnection() throws SQLException { if (connection != null) { return connection; @@ -210,6 +209,9 @@ public Connection getConnection() throws SQLException { return connection; } + public Connection getCurrentConnection() { + return connection; + } public void reconnect() throws Exception { close();