[infinispan-commits] Infinispan SVN: r1979 - in branches/4.1.x/core/src: test/java/org/infinispan/jmx and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-07-06 04:34:52 -0400 (Tue, 06 Jul 2010)
New Revision: 1979

Modified:
   branches/4.1.x/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
   branches/4.1.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
Log:
Fixed retry logic implementation regression as a result of changing managed attribute name in RpcManager implementation.

Modified: branches/4.1.x/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java	2010-07-05 18:42:47 UTC (rev 1978)
+++ branches/4.1.x/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java	2010-07-06 08:34:52 UTC (rev 1979)
@@ -383,8 +383,9 @@
    // mainly for unit testing
    public void setTransport(Transport t) {
       this.t = t;
-   }@Override
+   }
 
+   @Override
    public Address getAddress() {
       return t != null ? t.getAddress() : null;
    }

Modified: branches/4.1.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java	2010-07-05 18:42:47 UTC (rev 1978)
+++ branches/4.1.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java	2010-07-06 08:34:52 UTC (rev 1979)
@@ -210,8 +210,8 @@
       ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
       String cm1Address = manager(0).getAddress().toString();
       String cm2Address = manager(1).getAddress().toString();
-      assert mBeanServer.getAttribute(rpcManager1, "Address").equals(cm1Address);
-      assert mBeanServer.getAttribute(rpcManager2, "Address").equals(cm2Address);
+      assert mBeanServer.getAttribute(rpcManager1, "NodeAddress").equals(cm1Address);
+      assert mBeanServer.getAttribute(rpcManager2, "NodeAddress").equals(cm2Address);
 
       String cm1Members = mBeanServer.getAttribute(rpcManager1, "Members").toString();
       assert cm1Members.contains(cm1Address);