[hbase] branch branch-2 updated: HBASE-24570 connection#close throws NPE

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 13c5cfa  HBASE-24570 connection#close throws NPE
13c5cfa is described below

commit 13c5cfa361c99e4019b20b170c61664f2db19b20
Author: Bo Cui <cu...@163.com>
AuthorDate: Sat Jul 18 10:26:00 2020 +0800

    HBASE-24570 connection#close throws NPE
---
 .../java/org/apache/hadoop/hbase/client/ConnectionImplementation.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 c88908f..936f7f5 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
@@ -2113,7 +2113,9 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
       this.metrics.shutdown();
     }
     this.closed = true;
-    registry.close();
+    if (this.registry != null) {
+      registry.close();
+    }
     this.stubs.clear();
     if (clusterStatusListener != null) {
       clusterStatusListener.close();