commit c2b102c0bc1e2f678e7cd5977c51aabc8b880922
author Samarth Jain <samarth@apache.org> Wed Jul 19 11:49:35 2017 -0700
committer Samarth Jain <samarth@apache.org> Wed Jul 19 11:49:35 2017 -0700
tree 10b3455c240aa057ccf4bcf4ce2d5f80529d41e6
parent e95253f285980c36d605bacf2a3aa55bfddd36a4

PHOENIX-4041 CoprocessorHConnectionTableFactory should not open a new HConnection when shutting down

phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/IndexWriterUtils.java

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/IndexWriterUtils.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/IndexWriterUtils.java
index ea4ec1a..a82b277 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/IndexWriterUtils.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/IndexWriterUtils.java
@@ -121,11 +121,13 @@
         }
 
         @Override
-        public void shutdown() {
+        public synchronized void shutdown() {
             try {
-                getConnection(conf).close();
-            } catch (IOException e) {
-                LOG.error("Exception caught while trying to close the HConnection used by CoprocessorHConnectionTableFactory");
+                if (connection != null && !connection.isClosed()) {
+                    connection.close();
+                }
+            } catch (Throwable e) {
+                LOG.warn("Error while trying to close the HConnection used by CoprocessorHConnectionTableFactory", e);
             }
         }