Author: pferraro Date: 2008-10-24 11:08:55 -0400 (Fri, 24 Oct 2008) New Revision: 1997 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceImpl.java trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java Log: Duh - remote getResetRequests was using old method signature Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceImpl.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceImpl.java 2008-10-24 14:38:11 UTC (rev 1996) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceImpl.java 2008-10-24 15:08:55 UTC (rev 1997) @@ -53,8 +53,7 @@ public class HASingletonAwareResetRequestSourceImpl implements HASingletonAwareResetRequestSource { static final String METHOD_NAME = "getResetRequests"; - static final Object[] ARGS = new Object[0]; - static final Class<?>[] TYPES = new Class[0]; + static final Class<?>[] TYPES = new Class[] { Map.class }; private static final Logger log = Logger.getLogger(HASingletonAwareResetRequestSourceImpl.class); @@ -156,7 +155,7 @@ { try { - return this.serviceKeyProvider.getHAPartition().callMethodOnCluster(this.serviceKeyProvider.getHAServiceKey(), METHOD_NAME, ARGS, TYPES, true); + return this.serviceKeyProvider.getHAPartition().callMethodOnCluster(this.serviceKeyProvider.getHAServiceKey(), METHOD_NAME, new Object[] { response }, TYPES, true); } catch (Exception e) { Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java 2008-10-24 14:38:11 UTC (rev 1996) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java 2008-10-24 15:08:55 UTC (rev 1997) @@ -67,6 +67,7 @@ public void getResetRequests() throws Exception { Map<String, String> emptyMap = Collections.emptyMap(); + Map<String, ResetRequestSource.EngineStatus> emptyResponseMap = Collections.emptyMap(); MCMPRequest request1 = new MCMPRequest(MCMPRequestType.ENABLE_APP, false, "host1", emptyMap); MCMPRequest request2 = new MCMPRequest(MCMPRequestType.REMOVE_APP, false, "host2", emptyMap); @@ -78,11 +79,10 @@ EasyMock.expect(this.key.getHAPartition()).andReturn(this.partition); EasyMock.expect(this.key.getHAServiceKey()).andReturn("service:domain"); - EasyMock.expect(this.partition.callMethodOnCluster(EasyMock.eq("service:domain"), EasyMock.eq("getResetRequests"), EasyMock.aryEq(new Object[0]), EasyMock.aryEq(new Class[0]), EasyMock.eq(true))).andReturn(new ArrayList<ResetRequestGroupRpcResponse>(Arrays.asList(response1, response2))); + EasyMock.expect(this.partition.callMethodOnCluster(EasyMock.eq("service:domain"), EasyMock.eq("getResetRequests"), EasyMock.aryEq(new Object[] { emptyResponseMap }), EasyMock.aryEq(new Class[] { Map.class }), EasyMock.eq(true))).andReturn(new ArrayList<ResetRequestGroupRpcResponse>(Arrays.asList(response1, response2))); EasyMock.replay(this.singleton, this.key, this.partition); - Map<String, ResetRequestSource.EngineStatus> emptyResponseMap = Collections.emptyMap(); List<MCMPRequest> results = this.source.getResetRequests(emptyResponseMap); EasyMock.verify(this.singleton, this.key, this.partition); @@ -109,7 +109,7 @@ EasyMock.expect(this.key.getHAPartition()).andReturn(this.partition); EasyMock.expect(this.key.getHAServiceKey()).andReturn("service:domain"); - EasyMock.expect(this.partition.callMethodOnCluster(EasyMock.eq("service:domain"), EasyMock.eq("getResetRequests"), EasyMock.aryEq(new Object[0]), EasyMock.aryEq(new Class[0]), EasyMock.eq(true))).andReturn(new ArrayList<ResetRequestGroupRpcResponse>(Arrays.asList(response1, response2))); + EasyMock.expect(this.partition.callMethodOnCluster(EasyMock.eq("service:domain"), EasyMock.eq("getResetRequests"), EasyMock.aryEq(new Object[] { emptyResponseMap }), EasyMock.aryEq(new Class[] { Map.class }), EasyMock.eq(true))).andReturn(new ArrayList<ResetRequestGroupRpcResponse>(Arrays.asList(response1, response2))); EasyMock.expect(server.findServices()).andReturn(new Service[] { service }); EasyMock.expect(service.getContainer()).andReturn(engine);