Author: pferraro Date: 2008-10-07 16:04:15 -0400 (Tue, 07 Oct 2008) New Revision: 1942 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java trunk/mod_cluster/src/test/java/org/jboss/modcluster/ClusterListenerTestCase.java trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java Log: No need to check jvm route for null Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java 2008-10-07 14:23:14 UTC (rev 1941) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java 2008-10-07 20:04:15 UTC (rev 1942) @@ -242,10 +242,7 @@ for (Service service: services) { Engine engine = (Engine) service.getContainer(); - if (engine.getJvmRoute() != null) - { - requests.add(MCMPUtils.createRemoveAllRequest(engine)); - } + requests.add(MCMPUtils.createRemoveAllRequest(engine)); requests.add(MCMPUtils.createConfigRequest(engine, nodeConfig, balancerConfig)); Container[] children = engine.findChildren(); for (Container element: children) Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/ClusterListenerTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/ClusterListenerTestCase.java 2008-10-07 14:23:14 UTC (rev 1941) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/ClusterListenerTestCase.java 2008-10-07 20:04:15 UTC (rev 1942) @@ -93,7 +93,7 @@ EasyMock.expect(service.getContainer()).andReturn(engine); // create remove-all request - EasyMock.expect(engine.getJvmRoute()).andReturn("host1").times(2); + EasyMock.expect(engine.getJvmRoute()).andReturn("host1"); // create config request EasyMock.expect(engine.getService()).andReturn(service); 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-07 14:23:14 UTC (rev 1941) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java 2008-10-07 20:04:15 UTC (rev 1942) @@ -109,7 +109,7 @@ EasyMock.expect(server.findServices()).andReturn(new Service[] { service }); EasyMock.expect(service.getContainer()).andReturn(engine); - EasyMock.expect(engine.getJvmRoute()).andReturn("host").times(2); + EasyMock.expect(engine.getJvmRoute()).andReturn("host"); EasyMock.expect(engine.getService()).andReturn(service); EasyMock.expect(service.findConnectors()).andReturn(new Connector[] { connector }); @@ -225,7 +225,7 @@ EasyMock.expect(server.findServices()).andReturn(new Service[] { service }); EasyMock.expect(service.getContainer()).andReturn(engine); - EasyMock.expect(engine.getJvmRoute()).andReturn("host").times(2); + EasyMock.expect(engine.getJvmRoute()).andReturn("host"); EasyMock.expect(engine.getService()).andReturn(service); EasyMock.expect(service.findConnectors()).andReturn(new Connector[] { connector });