Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 4a6d27f4a -> 63111e7fa


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


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/63111e7f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/63111e7f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/63111e7f

Branch: refs/heads/4.x-HBase-0.98
Commit: 63111e7fa8f24623ff73ffdedf138b7f923d3a34
Parents: 4a6d27f
Author: Samarth Jain <[email protected]>
Authored: Wed Jul 19 11:46:28 2017 -0700
Committer: Samarth Jain <[email protected]>
Committed: Wed Jul 19 11:46:28 2017 -0700

----------------------------------------------------------------------
 .../phoenix/hbase/index/write/IndexWriterUtils.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/63111e7f/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 f2885a9..3649069 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
@@ -132,11 +132,13 @@ public class IndexWriterUtils {
         }
 
         @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);
             }
         }
 

Reply via email to