Index: src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java (revision 1452942) +++ src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java (working copy) @@ -99,9 +99,8 @@ @Override public void close() throws IOException { - if (watcher != null) { - watcher.close(); - } + // the watcher is passed from either Master or Region Server + // watcher.close() will be called by the owner so no need to call close() here } public String getAcquiredBarrierNode(String opInstanceName) { @@ -283,4 +282,4 @@ ZKUtil.deleteNodeRecursively(watcher, getReachedBarrierNode(procedureName)); ZKUtil.deleteNodeRecursively(watcher, getAbortZNode(procedureName)); } -} \ No newline at end of file +}