svn commit: r992425 - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/client/HConnectionManager.java test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java

[stack]

Author: stack
Date: Fri Sep  3 19:18:39 2010
New Revision: 992425

URL: http://svn.apache.org/viewvc?rev=992425&view=rev
Log:
HBASE-2955 hbase-2692 broke replication -- disabling replication tests till 
this issue is addressed

Modified:
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
    
hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=992425&r1=992424&r2=992425&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 Fri Sep  3 19:18:39 2010
@@ -1289,6 +1289,10 @@ public class HConnectionManager {
           HBaseRPC.stopProxy(i);
         }
       }
+      if (zooKeeper != null) {
+        zooKeeper.close();
+        zooKeeper = null;
+      }
     }
 
     /**
@@ -1523,10 +1527,6 @@ public class HConnectionManager {
     public void abort(final String msg, Throwable t) {
       if (t != null) LOG.fatal(msg, t);
       else LOG.fatal(msg);
-      if(zooKeeper != null) {
-        zooKeeper.close();
-        zooKeeper = null;
-      }
     }
   }
 }

Modified: 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java?rev=992425&r1=992424&r2=992425&view=diff
==============================================================================
--- 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
 (original)
+++ 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
 Fri Sep  3 19:18:39 2010
@@ -44,6 +44,7 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.net.URLEncoder;