JBoss Remoting SVN: r4058 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker.
by jboss-remoting-commits＠lists.jboss.org
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();
}
}
16 years, 9 months
JBoss Remoting SVN: r4057 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/threadpool.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-24 02:21:43 -0400 (Thu, 24 Apr 2008)
New Revision: 4057
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/threadpool/ThreadPoolEvictionTestCase.java
Log:
JBREM-930: For ConnectThreads with 0 delay, changed delay to 500.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/threadpool/ThreadPoolEvictionTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/threadpool/ThreadPoolEvictionTestCase.java 2008-04-24 06:12:57 UTC (rev 4056)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/threadpool/ThreadPoolEvictionTestCase.java 2008-04-24 06:21:43 UTC (rev 4057)
@@ -90,8 +90,8 @@
client1.connect();
// Use up server's threadpool.
- ConnectThread ct1 = new ConnectThread(client1, 0, "ct1");
- ConnectThread ct2 = new ConnectThread(client1, 0, "ct2");
+ ConnectThread ct1 = new ConnectThread(client1, 500, "ct1");
+ ConnectThread ct2 = new ConnectThread(client1, 500, "ct2");
ct1.start();
ct2.start();
Thread.sleep(2000);
@@ -155,8 +155,8 @@
client1.connect();
// Use up server's threadpool.
- ConnectThread ct1 = new ConnectThread(client1, 0, "ct1");
- ConnectThread ct2 = new ConnectThread(client1, 0, "ct2");
+ ConnectThread ct1 = new ConnectThread(client1, 500, "ct1");
+ ConnectThread ct2 = new ConnectThread(client1, 500, "ct2");
ct1.start();
ct2.start();
Thread.sleep(4000);
16 years, 9 months
JBoss Remoting SVN: r4056 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/registry.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-24 02:12:57 -0400 (Thu, 24 Apr 2008)
New Revision: 4056
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/registry/NetworkRegistryTestCase.java
Log:
JBREM-930: Made handleNotification() synchronized.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/registry/NetworkRegistryTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/registry/NetworkRegistryTestCase.java 2008-04-24 05:40:19 UTC (rev 4055)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/registry/NetworkRegistryTestCase.java 2008-04-24 06:12:57 UTC (rev 4056)
@@ -27,6 +27,8 @@
import java.security.PrivilegedExceptionAction;
import junit.framework.TestCase;
+
+import org.apache.log4j.Logger;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.detection.ServerInvokerMetadata;
import org.jboss.remoting.detection.multicast.MulticastDetector;
@@ -46,6 +48,7 @@
*/
public class NetworkRegistryTestCase extends TestCase implements NotificationListener
{
+ private static Logger log = Logger.getLogger(NetworkRegistryTestCase.class);
private String subSystem = null;
private int numOfAdded = 0;
private int numOfUpdated = 0;
@@ -93,11 +96,11 @@
// set config info for detector and start it.
detector1.start();
- System.out.println("First set started.");
+ log.info("First set started.");
Thread.sleep(3000);
- System.out.println("Starting second set.");
+ log.info("Starting second set.");
MBeanServer server2 = null;
try
@@ -131,18 +134,18 @@
// set config info for detector and start it.
detector2.start();
- System.out.println("Second set started.");
+ log.info("Second set started.");
Thread.sleep(5000);
// should have detected both new locators
assertEquals(2, numOfAdded);
- System.out.println("Stopping first set.");
+ log.info("Stopping first set.");
connector1.stop();
connector1.destroy();
detector1.stop();
- System.out.println("First set stopped.");
+ log.info("First set stopped.");
//DEBUG
// Thread.sleep(6000000);
@@ -153,11 +156,11 @@
// thus leaving only one valid locator
assertEquals(1, numOfUpdated);
- System.out.println("Stopping second set.");
+ log.info("Stopping second set.");
connector2.stop();
connector2.destroy();
detector2.stop();
- System.out.println("Stopped second set.");
+ log.info("Stopped second set.");
Thread.sleep(15000);
@@ -169,31 +172,31 @@
}
- public void handleNotification(Notification notification, Object o)
+ public synchronized void handleNotification(Notification notification, Object o)
{
- System.out.println("Received notification: " + notification);
+ log.info("Received notification: " + notification);
if (notification instanceof NetworkNotification)
{
NetworkNotification netNot = (NetworkNotification) notification;
if(NetworkNotification.SERVER_ADDED.equals(netNot.getType()))
{
numOfAdded = netNot.getLocator().length;
- //System.out.println("server added. num of locators added = " + numOfAdded);
+ log.info("server added. num of locators added = " + numOfAdded);
}
else if(NetworkNotification.SERVER_UPDATED.equals(netNot.getType()))
{
numOfUpdated = netNot.getLocator().length;
- //System.out.println("server updated. num of locators in update = " + numOfAdded);
+ log.info("server updated. num of locators in update = " + numOfAdded);
}
ServerInvokerMetadata[] serverMetadata = netNot.getServerInvokers();
- System.out.println(netNot.getIdentity());
- System.out.println(serverMetadata);
+ log.info(netNot.getIdentity());
+ log.info(serverMetadata);
InvokerLocator[] locators = netNot.getLocator();
if (locators != null)
{
for (int x = 0; x < locators.length; x++)
{
- System.out.println(locators[x]);
+ log.info(locators[x]);
}
}
subSystem = serverMetadata[0].getSubSystems()[0];
@@ -217,7 +220,7 @@
}
catch (PrivilegedActionException e)
{
- System.out.println(e.getCause());
+ log.info(e.getCause());
throw (Exception) e.getCause();
}
}
@@ -238,7 +241,7 @@
}
catch (PrivilegedActionException e)
{
- System.out.println(e.getCause());
+ log.info(e.getCause());
throw (Exception) e.getCause();
}
}
16 years, 9 months
JBoss Remoting SVN: r4055 - remoting2/branches/2.x/src/tests/org/jboss/ant/taskdefs.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-24 01:40:19 -0400 (Thu, 24 Apr 2008)
New Revision: 4055
Modified:
remoting2/branches/2.x/src/tests/org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java
Log:
JBREM-934: Replaced reference to SecurityUtility with explicit AccessControl.doPrivileged() call.
Modified: remoting2/branches/2.x/src/tests/org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java 2008-04-24 05:38:43 UTC (rev 4054)
+++ remoting2/branches/2.x/src/tests/org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java 2008-04-24 05:40:19 UTC (rev 4055)
@@ -28,7 +28,6 @@
import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter;
-import org.jboss.remoting.util.SecurityUtility;
/**
* @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a>
@@ -38,8 +37,24 @@
public void startTestSuite(final JUnitTest test)
{
- String configuration = SecurityUtility.getSystemProperty("jboss-junit-configuration");
+// String configuration = SecurityUtility.getSystemProperty("jboss-junit-configuration");
+ String configuration = null;
+ try
+ {
+ configuration = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ return System.getProperty("jboss-junit-configuration");
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (RuntimeException) e.getCause();
+ }
+
// if sys prop is not null, empty, or contain default variable alias
if(configuration != null && !configuration.trim().equals("") &&
configuration.indexOf("jboss-junit-configuration") == -1)
16 years, 9 months
JBoss Remoting SVN: r4054 - remoting2/branches/2.x/src/main/org/jboss/remoting/util.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-24 01:38:43 -0400 (Thu, 24 Apr 2008)
New Revision: 4054
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java
Log:
JBREM-934: Commented out printing value of "skipAccessControl".
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java 2008-04-24 05:36:33 UTC (rev 4053)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java 2008-04-24 05:38:43 UTC (rev 4054)
@@ -96,7 +96,7 @@
{
e.getCause().printStackTrace();
}
- System.out.println("skipAccessControl: " + skipAccessControl);
+// System.out.println("skipAccessControl: " + skipAccessControl);
}
16 years, 9 months
JBoss Remoting SVN: r4053 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/multicast/startup.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-24 01:36:33 -0400 (Thu, 24 Apr 2008)
New Revision: 4053
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/multicast/startup/MulticastDetectorClient.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/multicast/startup/MulticastDetectorServer.java
Log:
JBREM-930: Instead of expecting a single Connect, the client expects to find the Connector created by the server.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/multicast/startup/MulticastDetectorClient.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/multicast/startup/MulticastDetectorClient.java 2008-04-24 04:26:07 UTC (rev 4052)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/multicast/startup/MulticastDetectorClient.java 2008-04-24 05:36:33 UTC (rev 4053)
@@ -22,6 +22,9 @@
package org.jboss.test.remoting.detection.multicast.startup;
import junit.framework.TestCase;
+
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.detection.multicast.MulticastDetector;
import org.jboss.remoting.network.NetworkInstance;
import org.jboss.remoting.network.NetworkRegistry;
@@ -61,10 +64,41 @@
NetworkInstance[] instances = detector.forceDetection();
long end = System.currentTimeMillis();
- System.out.println("instance = " + instances);
+ System.out.println("instances");
+ for (int i = 0; i < instances.length; i++)
+ {
+ System.out.println(" " + instances[i]);
+ }
System.out.println("force detection took " + (end - start) + " milliseconds.");
+
+ boolean foundServer = false;
+ mainLoop: for (int i = 0; i < instances.length; i++)
+ {
+ InvokerLocator[] locators = instances[i].getLocators();
+ for (int j = 0; j < locators.length; j++)
+ {
+ Client client = new Client(locators[j]);
+ client.connect();
+ try
+ {
+ if ("MulticastDetectorServer".equals(client.invoke("abc")))
+ {
+ foundServer = true;
+ break mainLoop;
+ }
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ }
+ finally
+ {
+ client.disconnect();
+ }
+ }
+ }
- assertEquals(1, instances.length);
+ assertTrue(foundServer);
}
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/multicast/startup/MulticastDetectorServer.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/multicast/startup/MulticastDetectorServer.java 2008-04-24 04:26:07 UTC (rev 4052)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/multicast/startup/MulticastDetectorServer.java 2008-04-24 05:36:33 UTC (rev 4053)
@@ -25,13 +25,15 @@
import org.apache.log4j.Level;
import org.jboss.jrunit.extensions.ServerTestCase;
+import org.jboss.remoting.InvocationRequest;
import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
import org.jboss.remoting.detection.multicast.MulticastDetector;
import org.jboss.remoting.network.NetworkRegistry;
import org.jboss.remoting.transport.Connector;
import org.jboss.test.remoting.TestUtil;
-import org.jboss.test.remoting.transport.mock.MockServerInvocationHandler;
-
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
@@ -69,7 +71,7 @@
connector.setInvokerLocator(locator.getLocatorURI());
connector.create();
- MockServerInvocationHandler handler = new MockServerInvocationHandler();
+ TestInvocationHandler handler = new TestInvocationHandler();
connector.addInvocationHandler("mock", handler);
ObjectName obj = new ObjectName("jboss.remoting:type=Connector,transport=" + locator.getProtocol());
@@ -114,5 +116,15 @@
}
-
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ return "MulticastDetectorServer";
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
}
\ No newline at end of file
16 years, 9 months
JBoss Remoting SVN: r4052 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-24 00:26:07 -0400 (Thu, 24 Apr 2008)
New Revision: 4052
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi/RestartTestClient.java
Log:
JBREM-930: Make multiple attempts to connect JNDIDetector to JNDI.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi/RestartTestClient.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi/RestartTestClient.java 2008-04-24 04:16:56 UTC (rev 4051)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi/RestartTestClient.java 2008-04-24 04:26:07 UTC (rev 4052)
@@ -94,11 +94,24 @@
detector.setURLPackage(urlPackage);
server.registerMBean(detector, new ObjectName("remoting:type=JNDIDetector"));
- detector.start();
- log.info("JNDIDetector has been created and is listening for new NetworkRegistries to come online");
+
+ for (int i = 0; i < 5; i++)
+ {
+ try
+ {
+ detector.start();
+ log.info("JNDIDetector has been created and is listening for new NetworkRegistries to come online");
+ break;
+ }
+ catch (Exception e)
+ {
+ log.info("unable to connect to JDNI: will try again");
+ Thread.sleep(2000);
+ }
+ }
}
+
-
public void tearDown() throws Exception
{
detector.stop();
16 years, 9 months
JBoss Remoting SVN: r4051 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/metadata.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-24 00:16:56 -0400 (Thu, 24 Apr 2008)
New Revision: 4051
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/metadata/MetadataTestCase.java
Log:
JBREM-930: Stop Connectors in finally clause.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/metadata/MetadataTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/metadata/MetadataTestCase.java 2008-04-24 04:09:15 UTC (rev 4050)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/metadata/MetadataTestCase.java 2008-04-24 04:16:56 UTC (rev 4051)
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
import org.apache.log4j.Level;
+import org.jboss.logging.XLevel;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.detection.ServerInvokerMetadata;
import org.jboss.remoting.detection.multicast.MulticastDetector;
@@ -43,8 +44,6 @@
import java.net.InetAddress;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.util.List;
/**
@@ -66,7 +65,7 @@
{
org.apache.log4j.BasicConfigurator.configure();
org.apache.log4j.Category.getRoot().setLevel(Level.DEBUG);
- org.apache.log4j.Category.getInstance("org.jboss.remoting").setLevel(Level.DEBUG);
+ org.apache.log4j.Category.getInstance("org.jboss.remoting").setLevel(XLevel.TRACE);
org.apache.log4j.Category.getInstance("org.jgroups").setLevel(Level.FATAL);
MulticastDetector detector1 = new MulticastDetector();
@@ -74,55 +73,65 @@
Connector connector1 = new Connector();
Connector connector2 = new Connector();
-
- NetworkRegistry reg1 = setupServers(detector1, connector1);
- // need to register with the mbean server for notifications
- List mbeanServers
- = (List) AccessController.doPrivileged( new PrivilegedAction()
- {
- public Object run()
- {
- return MBeanServerFactory.findMBeanServer(null);
- }
- });
- MBeanServer mbeanSvr = (MBeanServer) mbeanServers.get(0);
- mbeanSvr.addNotificationListener(new ObjectName("remoting:type=NetworkRegistry"),
- this, null, null);
+ try
+ {
+ NetworkRegistry reg1 = setupServers(detector1, connector1);
+ // need to register with the mbean server for notifications
+ List mbeanServers = (List) AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return MBeanServerFactory.findMBeanServer(null);
+ }
+ });
- NetworkRegistry reg2 = setupServers(detector2, connector2);
+ MBeanServer mbeanSvr = (MBeanServer) mbeanServers.get(0);
+ mbeanSvr.addNotificationListener(new ObjectName("remoting:type=NetworkRegistry"),
+ this, null, null);
- // Need to allow heartbeat so have detection
- Thread.currentThread().sleep(2000);
+ NetworkRegistry reg2 = setupServers(detector2, connector2);
- //Should now have an entry for both of the registries
- int reg1Count = reg1.getServers().length;
- int reg2Count = reg2.getServers().length;
+ // Need to allow heartbeat so have detection
+ Thread.currentThread().sleep(2000);
- // Actual junit test
- assertTrue(reg1Count == 1 && reg2Count == 1);
+ //Should now have an entry for both of the registries
+ int reg1Count = reg1.getServers().length;
+ int reg2Count = reg2.getServers().length;
- if(reg1Count == 1 && reg2Count == 1)
- {
- System.out.println("PASSED - both registries have found the detectors.");
+ if(reg1Count == 1 && reg2Count == 1)
+ {
+ System.out.println("PASSED - both registries have found the detectors.");
+ }
+ else
+ {
+ System.out.println("FAILED - registries not populated with remote detectors.");
+ }
+
+ // Actual junit test
+ assertTrue(reg1Count == 1 && reg2Count == 1);
+
+ // now check to make sure got the subsystem as expected
+ assertEquals("MOCK", subSystem);
}
- else
+ finally
{
- System.out.println("FAILED - registries not populated with remote detectors.");
+ // stop the 2nd detector, so see if 1st one detects it is missing
+ if (connector1 != null)
+ {
+ connector1.stop();
+ connector1.destroy();
+ connector1 = null;
+ }
+ if (connector2 != null)
+ {
+ connector2.stop();
+ connector2.destroy();
+ connector2 = null;
+ }
+ if (detector1 != null) detector1.stop();
+ if (detector2 != null) detector2.stop();
}
-
- // now check to make sure got the subsystem as expected
- assertEquals("MOCK", subSystem);
-
- // stop the 2nd detector, so see if 1st one detects it is missing
- connector1.stop();
- connector1.destroy();
- connector1 = null;
- connector2.stop();
- connector2.destroy();
- connector2 = null;
- detector1.stop();
- detector2.stop();
//connector2.stop();
//connector2.destroy();
}
16 years, 9 months
JBoss Remoting SVN: r4050 - remoting2/branches/2.x/src/main/org/jboss/remoting/network.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-24 00:09:15 -0400 (Thu, 24 Apr 2008)
New Revision: 4050
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/network/NetworkRegistry.java
Log:
JBREM-930: Added this to some log output.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/network/NetworkRegistry.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/network/NetworkRegistry.java 2008-04-24 04:08:09 UTC (rev 4049)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/network/NetworkRegistry.java 2008-04-24 04:09:15 UTC (rev 4050)
@@ -96,7 +96,7 @@
}
if(found)
{
- log.debug("addServer - " + identity);
+ log.debug(this + " addServer - " + identity);
// put this on a separate thread so we don't block further detection ...
// TODO: this needs to go into a thread pool thread -JGH
@@ -215,7 +215,7 @@
}
if(instance != null)
{
- log.debug("removeServer - " + identity);
+ log.debug(this + " removeServer - " + identity);
final ServerInvokerMetadata il[] = instance.getServerInvokers();
// put this on a separate thread so we don't block further detection ...
16 years, 9 months
JBoss Remoting SVN: r4049 - remoting2/branches/2.x/src/main/org/jboss/remoting/detection.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-24 00:08:09 -0400 (Thu, 24 Apr 2008)
New Revision: 4049
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/detection/AbstractDetector.java
Log:
JBREM-930: Added this to some log output.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/detection/AbstractDetector.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/detection/AbstractDetector.java 2008-04-24 00:31:58 UTC (rev 4048)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/detection/AbstractDetector.java 2008-04-24 04:08:09 UTC (rev 4049)
@@ -491,7 +491,7 @@
{
if (networkRegistry != null)
{
- log.debug("detected NEW server: " + detection);
+ log.debug(this + " detected NEW server: " + detection);
AccessController.doPrivileged( new PrivilegedAction()
{
@@ -513,7 +513,7 @@
{
if (log.isTraceEnabled())
{
- log.trace("detected UPDATE for server: " + detection);
+ log.trace(this + " detected UPDATE for server: " + detection);
}
AccessController.doPrivileged( new PrivilegedAction()
16 years, 9 months