diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index 991c7fd..2130bb1 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -159,6 +159,7 @@ public class HBaseAdmin implements Abortable, Closeable { private final int retryLongerMultiplier; private boolean aborted; private boolean cleanupConnectionOnClose = false; // close the connection in close() + private boolean closed = false; private RpcRetryingCallerFactory rpcCallerFactory; @@ -2323,9 +2324,9 @@ public class HBaseAdmin implements Abortable, Closeable { @Override public synchronized void close() throws IOException { - if (cleanupConnectionOnClose && this.connection != null) { + if (cleanupConnectionOnClose && this.connection != null && !this.closed) { this.connection.close(); - this.connection = null; + this.closed = true; } }