diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java index 2f5eddabb4..bf1c52f6a5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java @@ -318,7 +318,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable { } } catch (Throwable e) { // avoid leaks: registry, rpcClient, ... - LOG.debug("connection construction failed", e); + LOG.info("connection construction failed", e); close(); throw e; } @@ -1959,8 +1959,12 @@ class ConnectionImplementation implements ClusterConnection, Closeable { this.metrics.shutdown(); } this.closed = true; - registry.close(); - this.stubs.clear(); + if (this.registry != null) { + registry.close(); + } + if (this.stubs != null) { + this.stubs.clear(); + } if (clusterStatusListener != null) { clusterStatusListener.close(); }