Author: ron.sigal(a)jboss.com
Date: 2008-04-24 02:38:18 -0400 (Thu, 24 Apr 2008)
New Revision: 4058
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/LocalInvokerTestCase.java
Log:
JBREM-930: (1) Doesn't hard code InvokerLocator; (2) avoids NullPointerException.
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/LocalInvokerTestCase.java
===================================================================
---
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/LocalInvokerTestCase.java 2008-04-24
06:21:43 UTC (rev 4057)
+++
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/LocalInvokerTestCase.java 2008-04-24
06:38:18 UTC (rev 4058)
@@ -22,6 +22,8 @@
package org.jboss.test.remoting.invoker;
+import java.net.InetAddress;
+
import junit.framework.TestCase;
import org.apache.log4j.Logger;
import org.jboss.remoting.Client;
@@ -31,6 +33,7 @@
import org.jboss.remoting.ServerInvoker;
import org.jboss.remoting.callback.InvokerCallbackHandler;
import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
import org.jboss.remoting.transport.local.LocalClientInvoker;
import javax.management.MBeanServer;
@@ -89,7 +92,9 @@
try
{
- invokerLocator = new InvokerLocator("socket://127.0.0.1:9090");
+ String host = InetAddress.getLocalHost().getHostAddress();
+ int port = PortUtil.findFreePort(host);
+ invokerLocator = new InvokerLocator("socket://" + host + ":"
+ port);
Integer secret = new Integer(3);
runTestForTwoClients(invokerLocator, secret);
@@ -141,7 +146,9 @@
try
{
- invokerLocator = new InvokerLocator("socket://127.0.0.1:9090");
+ String host = InetAddress.getLocalHost().getHostAddress();
+ int port = PortUtil.findFreePort(host);
+ invokerLocator = new InvokerLocator("socket://" + host + ":"
+ port);
Integer secret = new Integer(3);
connector = makeConnector(invokerLocator, secret);
@@ -182,8 +189,8 @@
}
finally
{
- client.disconnect();
- connector.stop();
+ if (client != null) client.disconnect();
+ if (connector != null) connector.stop();
}
}
Show replies by date