hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1588396 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java
Date Fri, 18 Apr 2014 01:01:11 GMT
Author: tedyu
Date: Fri Apr 18 01:01:11 2014
New Revision: 1588396

URL: http://svn.apache.org/r1588396
Log:
HBASE-11019 incCount() method should be properly stubbed in HConnectionTestingUtility#getMockedConnectionAndDecorate()


Modified:
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java?rev=1588396&r1=1588395&r2=1588396&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
(original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
Fri Apr 18 01:01:11 2014
@@ -474,8 +474,6 @@ class ConnectionManager {
     // package protected for the tests
     ClusterStatusListener clusterStatusListener;
 
-    private final Object userRegionLock = new Object();
-
     // We have a single lock for master & zk to prevent deadlocks. Having
     //  one lock for ZK and one lock for master is not possible:
     //  When creating a connection to master, we need a connection to ZK to get

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java?rev=1588396&r1=1588395&r2=1588396&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java
(original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java
Fri Apr 18 01:01:11 2014
@@ -123,6 +123,8 @@ public class HConnectionTestingUtility {
     Mockito.when(c.getNonceGenerator()).thenReturn(ng);
     Mockito.when(c.getAsyncProcess()).thenReturn(new AsyncProcess(
         c, conf, null, RpcRetryingCallerFactory.instantiate(conf), false));
+    Mockito.doNothing().when(c).incCount();
+    Mockito.doNothing().when(c).decCount();
     return c;
   }
 



Mime
View raw message