svn commit: r1453679 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java

[te...@apache.org]

Author: tedyu
Date: Thu Mar  7 04:08:57 2013
New Revision: 1453679

URL: http://svn.apache.org/r1453679
Log:
HBASE-8019 Port HBASE-7779 '[snapshot 130201 merge] Fix TestMultiParallel' to 0.94 (Ted Yu)


Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java?rev=1453679&r1=1453678&r2=1453679&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java Thu Mar  7 04:08:57 2013
@@ -99,9 +99,8 @@ public abstract class ZKProcedureUtil
 
   @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 @@ public abstract class ZKProcedureUtil
     ZKUtil.deleteNodeRecursively(watcher, getReachedBarrierNode(procedureName));
     ZKUtil.deleteNodeRecursively(watcher, getAbortZNode(procedureName));
   }
-}
\ No newline at end of file
+}