JBoss Remoting SVN: r4754 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 23:19:39 -0500 (Sat, 29 Nov 2008)
New Revision: 4754
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java
Log:
JBREM-1070: Made some changes to synchronization on "lock" variable.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java 2008-11-30 04:19:02 UTC (rev 4753)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java 2008-11-30 04:19:39 UTC (rev 4754)
@@ -228,6 +228,7 @@
private ClientInvoker clientInvoker;
private Object lock = new Object();
private Object notificationLock = new Object();
+ private boolean started;
private volatile boolean stopped;
private String invokerSessionId;
private boolean tieToLease = true;
@@ -283,51 +284,54 @@
*/
public void run()
{
- synchronized (lock) {
- if (timer == null)
+ synchronized (lock)
+ {
+ if (!started)
{
throw new IllegalStateException(
ConnectionValidator.class.getName() + ".run() should not be " +
"called directly; use " + ConnectionValidator.class.getName() +
".addConnectionListener() instead.");
}
- }
-
- TimerTask tt = new WaitOnConnectionCheckTimerTask();
+
+ if (stopped)
+ {
+ return;
+ }
+
+ TimerTask tt = new WaitOnConnectionCheckTimerTask();
- try
- {
- timer.schedule(tt, 0);
+ try
+ {
+ timer.schedule(tt, 0);
+ }
+ catch (IllegalStateException e)
+ {
+ log.debug("Unable to schedule TimerTask on existing Timer", e);
+ timer = new Timer(true);
+ timer.schedule(tt, 0);
+ }
}
- catch (IllegalStateException e)
- {
- log.debug("Unable to schedule TimerTask on existing Timer", e);
- timer = new Timer(true);
- timer.schedule(tt, 0);
- }
try
{
- synchronized(lock)
+ if(!stopped)
{
- if(!stopped)
+ isValid = false;
+
+ if (tieToLease && client.getLeasePeriod() > 0)
{
- isValid = false;
-
- if (tieToLease && client.getLeasePeriod() > 0)
+ if (trace)
{
- if (trace)
- {
- log.trace(this + " sending PING tied to lease");
- }
- isValid = doCheckConnectionWithLease();
+ log.trace(this + " sending PING tied to lease");
}
- else
- {
- if (trace) { log.trace(this + " pinging ..."); }
- isValid = doCheckConnectionWithoutLease();
- }
+ isValid = doCheckConnectionWithLease();
}
+ else
+ {
+ if (trace) { log.trace(this + " pinging ..."); }
+ isValid = doCheckConnectionWithoutLease();
+ }
}
}
catch (Throwable thr)
@@ -523,7 +527,7 @@
}
TimerUtil.schedule(this, pingPeriod);
- stopped = false;
+ started = true;
timer = new Timer(true);
log.debug(this + " started");
}
@@ -622,6 +626,10 @@
final Throwable t = thr;
synchronized (lock)
{
+ if (stopped)
+ {
+ return;
+ }
ListIterator itr = listeners.listIterator();
while (itr.hasNext())
{
16 years, 11 months
JBoss Remoting SVN: r4753 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection: deadlock and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 23:19:02 -0500 (Sat, 29 Nov 2008)
New Revision: 4753
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
Log:
JBREM-1070: New unit test.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java 2008-11-30 04:19:02 UTC (rev 4753)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.remoting.connection.deadlock;
+
+import org.jboss.jrunit.harness.TestDriver;
+
+/**
+ * Unit test for JBREM-1070.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Nov 29, 2008
+ * </p>
+ */
+public class DeadlockTestCase extends TestDriver
+{
+ public void declareTestClasses()
+ {
+ addTestClasses(DeadlockTestClient.class.getName(),
+ 1,
+ DeadlockTestServer.class.getName());
+ }
+
+ protected long getResultsTimeout()
+ {
+ return 240000;
+ }
+}
\ No newline at end of file
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java 2008-11-30 04:19:02 UTC (rev 4753)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.remoting.connection.deadlock;
+
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.ConnectionValidator;
+import org.jboss.remoting.InvokerLocator;
+
+/**
+ * Unit test for JBREM-1070.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Nov 29, 2008
+ * </p>
+ */
+public class DeadlockTestClient extends TestCase
+{
+ private static Logger log = Logger.getLogger(DeadlockTestClient.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port = 7777;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testForDeadlock() throws Throwable
+ {
+ log.info("entering " + getName());
+ for (int i = 0; i < 10; i++)
+ {
+ assertTrue("failed execution: " + i, doTest());
+ log.info("execution " + i + " PASSES\n");
+ }
+ log.info(getName() + " PASSES");
+ }
+
+
+ public boolean doTest() throws Throwable
+ {
+ // Create client.
+ host = InetAddress.getLocalHost().getHostAddress();
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "5000");
+ clientConfig.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "1000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connections.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Add ConnectionListener.
+ TestConnectionListener listener = new TestConnectionListener();
+ client.addConnectionListener(listener);
+
+ // Wait for notification.
+ for (int i = 0; i < 20; i++)
+ {
+ if (listener.ok)
+ {
+ break;
+ }
+ Thread.sleep(1000);
+ }
+
+ client.disconnect();
+ return listener.ok;
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+
+
+ static class TestConnectionListener implements ConnectionListener
+ {
+ public boolean ok;
+
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ ok = true;
+ log.info("handleConnectionException() called");
+ }
+ }
+}
\ No newline at end of file
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-30 04:19:02 UTC (rev 4753)
@@ -0,0 +1,193 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.remoting.connection.deadlock;
+
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.jrunit.extensions.ServerTestCase;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ConnectionListener;
+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.transport.socket.SocketServerInvoker;
+
+
+/**
+ * Unit test for JBREM-1070.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Nov 29, 2008
+ * </p>
+ */
+public class DeadlockTestServer extends ServerTestCase
+{
+ private static Logger log = Logger.getLogger(DeadlockTestServer.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port = 7777;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected TestServerInvoker serverInvoker;
+ protected TestInvocationHandler invocationHandler;
+
+
+ public static void main(String[] args)
+ {
+ try
+ {
+ DeadlockTestServer server = new DeadlockTestServer();
+ server.setUp();
+ Thread.sleep(600000);
+ server.shutdownServer();
+ }
+ catch (Throwable t)
+ {
+ log.error("error", t);
+ }
+ }
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+
+ setupServer();
+ }
+
+
+ public void tearDown() throws Exception
+ {
+ shutdownServer();
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraServerConfig(config);
+
+ serverInvoker = new TestServerInvoker(serverLocator, config);
+ serverInvoker.create();
+ invocationHandler = new TestInvocationHandler();
+ serverInvoker.addInvocationHandler("test", invocationHandler);
+ serverInvoker.start();
+ log.info("TestServerInvoker(" + locatorURI + ") started");
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (serverInvoker != null)
+ serverInvoker.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ return invocation.getParameter();
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+ static class TestServerInvoker extends SocketServerInvoker
+ {
+ public TestServerInvoker(InvokerLocator locator, Map config)
+ {
+ super(locator, config);
+ log.info("TestServerInvoker: " + locator);
+ }
+ public Object invoke(InvocationRequest invocation) throws Throwable
+ {
+ if ("$PING$".equals(invocation.getParameter()))
+ {
+ log.info("TestServerInvoker received $PING$");
+ Thread.sleep(10000);
+ throw new Exception("got $PING$");
+ }
+ else
+ {
+ return super.invoke(invocation);
+ }
+ }
+ }
+
+ static class TestConnectionListener implements ConnectionListener
+ {
+ public boolean ok;
+
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ ok = true;
+ log.info("handleConnectionException() called");
+ }
+ }
+}
\ No newline at end of file
16 years, 11 months
JBoss Remoting SVN: r4752 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 23:07:23 -0500 (Sat, 29 Nov 2008)
New Revision: 4752
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
Log:
JBREM-1070: Eliminated reference to XLevel.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-30 04:02:17 UTC (rev 4751)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-30 04:07:23 UTC (rev 4752)
@@ -33,7 +33,6 @@
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.jboss.jrunit.extensions.ServerTestCase;
-import org.jboss.logging.XLevel;
import org.jboss.remoting.Client;
import org.jboss.remoting.ConnectionListener;
import org.jboss.remoting.InvocationRequest;
16 years, 11 months
JBoss Remoting SVN: r4751 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 23:02:17 -0500 (Sat, 29 Nov 2008)
New Revision: 4751
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
Log:
JBREM-1070: Removed setupServer() from main().
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-30 03:57:28 UTC (rev 4750)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-30 04:02:17 UTC (rev 4751)
@@ -73,7 +73,6 @@
{
DeadlockTestServer server = new DeadlockTestServer();
server.setUp();
- server.setupServer();
Thread.sleep(600000);
server.shutdownServer();
}
16 years, 11 months
JBoss Remoting SVN: r4750 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 22:57:28 -0500 (Sat, 29 Nov 2008)
New Revision: 4750
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
Log:
JBREM-1070: Class extends jrunit ServerTestCase.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-30 03:56:41 UTC (rev 4749)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-30 03:57:28 UTC (rev 4750)
@@ -28,12 +28,11 @@
import javax.management.MBeanServer;
-import junit.framework.TestCase;
-
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
+import org.jboss.jrunit.extensions.ServerTestCase;
import org.jboss.logging.XLevel;
import org.jboss.remoting.Client;
import org.jboss.remoting.ConnectionListener;
@@ -54,7 +53,7 @@
* Copyright Nov 29, 2008
* </p>
*/
-public class DeadlockTestServer extends TestCase
+public class DeadlockTestServer extends ServerTestCase
{
private static Logger log = Logger.getLogger(DeadlockTestServer.class);
@@ -85,23 +84,26 @@
}
- public void setUp()
+ public void setUp() throws Exception
{
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
PatternLayout layout = new PatternLayout(pattern);
ConsoleAppender consoleAppender = new ConsoleAppender(layout);
Logger.getRootLogger().addAppender(consoleAppender);
}
+
+ setupServer();
}
- public void tearDown()
+ public void tearDown() throws Exception
{
+ shutdownServer();
}
@@ -170,7 +172,7 @@
if ("$PING$".equals(invocation.getParameter()))
{
log.info("TestServerInvoker received $PING$");
- Thread.sleep(20000);
+ Thread.sleep(10000);
throw new Exception("got $PING$");
}
else
16 years, 11 months
JBoss Remoting SVN: r4749 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 22:56:41 -0500 (Sat, 29 Nov 2008)
New Revision: 4749
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
Log:
JBREM-1070: Reduced iterations to 10; reduced ping timeout to 5000.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java 2008-11-30 03:55:59 UTC (rev 4748)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java 2008-11-30 03:56:41 UTC (rev 4749)
@@ -32,7 +32,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
-import org.jboss.logging.XLevel;
import org.jboss.remoting.Client;
import org.jboss.remoting.ConnectionListener;
import org.jboss.remoting.ConnectionValidator;
@@ -82,7 +81,7 @@
public void testForDeadlock() throws Throwable
{
log.info("entering " + getName());
- for (int i = 0; i < 20; i++)
+ for (int i = 0; i < 10; i++)
{
assertTrue("failed execution: " + i, doTest());
log.info("execution " + i + " PASSES\n");
@@ -103,7 +102,7 @@
}
InvokerLocator clientLocator = new InvokerLocator(locatorURI);
HashMap clientConfig = new HashMap();
- clientConfig.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "10000");
+ clientConfig.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "5000");
clientConfig.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "1000");
addExtraClientConfig(clientConfig);
Client client = new Client(clientLocator, clientConfig);
16 years, 11 months
JBoss Remoting SVN: r4748 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 22:55:59 -0500 (Sat, 29 Nov 2008)
New Revision: 4748
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
Log:
JBREM-1070: Extended test timeout.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java 2008-11-30 03:35:32 UTC (rev 4747)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java 2008-11-30 03:55:59 UTC (rev 4748)
@@ -41,4 +41,9 @@
1,
DeadlockTestServer.class.getName());
}
+
+ protected long getResultsTimeout()
+ {
+ return 240000;
+ }
}
\ No newline at end of file
16 years, 11 months
JBoss Remoting SVN: r4747 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 22:35:32 -0500 (Sat, 29 Nov 2008)
New Revision: 4747
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
Log:
JBREM-1070: Reduced iterations and shortened ping interval; cosmetic changes.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java 2008-11-30 03:34:56 UTC (rev 4746)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java 2008-11-30 03:35:32 UTC (rev 4747)
@@ -1,3 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
package org.jboss.test.remoting.connection.deadlock;
import java.net.InetAddress;
@@ -16,7 +38,15 @@
import org.jboss.remoting.ConnectionValidator;
import org.jboss.remoting.InvokerLocator;
-
+/**
+ * Unit test for JBREM-1070.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Nov 29, 2008
+ * </p>
+ */
public class DeadlockTestClient extends TestCase
{
private static Logger log = Logger.getLogger(DeadlockTestClient.class);
@@ -34,7 +64,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
PatternLayout layout = new PatternLayout(pattern);
@@ -52,10 +82,10 @@
public void testForDeadlock() throws Throwable
{
log.info("entering " + getName());
- for (int i = 0; i < 50; i++)
+ for (int i = 0; i < 20; i++)
{
assertTrue("failed execution: " + i, doTest());
- log.info("execution " + i + " PASES\n");
+ log.info("execution " + i + " PASSES\n");
}
log.info(getName() + " PASSES");
}
@@ -74,7 +104,7 @@
InvokerLocator clientLocator = new InvokerLocator(locatorURI);
HashMap clientConfig = new HashMap();
clientConfig.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "10000");
- clientConfig.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "20000");
+ clientConfig.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "1000");
addExtraClientConfig(clientConfig);
Client client = new Client(clientLocator, clientConfig);
client.connect();
16 years, 11 months
JBoss Remoting SVN: r4746 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 22:34:56 -0500 (Sat, 29 Nov 2008)
New Revision: 4746
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
Log:
JBREM-1070: Cosmetic changes.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java 2008-11-29 07:09:01 UTC (rev 4745)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java 2008-11-30 03:34:56 UTC (rev 4746)
@@ -1,30 +1,38 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.remoting.connection.deadlock;
import org.jboss.jrunit.harness.TestDriver;
-
+/**
+ * Unit test for JBREM-1070.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Nov 29, 2008
+ * </p>
+ */
public class DeadlockTestCase extends TestDriver
{
public void declareTestClasses()
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-29 07:09:01 UTC (rev 4745)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-30 03:34:56 UTC (rev 4746)
@@ -1,3 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
package org.jboss.test.remoting.connection.deadlock;
import java.net.InetAddress;
@@ -23,6 +45,15 @@
import org.jboss.remoting.transport.socket.SocketServerInvoker;
+/**
+ * Unit test for JBREM-1070.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Nov 29, 2008
+ * </p>
+ */
public class DeadlockTestServer extends TestCase
{
private static Logger log = Logger.getLogger(DeadlockTestServer.class);
16 years, 11 months
JBoss Remoting SVN: r4745 - in remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection: deadlock and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 02:09:01 -0500 (Sat, 29 Nov 2008)
New Revision: 4745
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
Log:
JBREM-1070: New unit test.
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java 2008-11-29 07:09:01 UTC (rev 4745)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.test.remoting.connection.deadlock;
+
+import org.jboss.jrunit.harness.TestDriver;
+
+
+public class DeadlockTestCase extends TestDriver
+{
+ public void declareTestClasses()
+ {
+ addTestClasses(DeadlockTestClient.class.getName(),
+ 1,
+ DeadlockTestServer.class.getName());
+ }
+}
\ No newline at end of file
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java 2008-11-29 07:09:01 UTC (rev 4745)
@@ -0,0 +1,125 @@
+package org.jboss.test.remoting.connection.deadlock;
+
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.logging.XLevel;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.ConnectionValidator;
+import org.jboss.remoting.InvokerLocator;
+
+
+public class DeadlockTestClient extends TestCase
+{
+ private static Logger log = Logger.getLogger(DeadlockTestClient.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port = 7777;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testForDeadlock() throws Throwable
+ {
+ log.info("entering " + getName());
+ for (int i = 0; i < 50; i++)
+ {
+ assertTrue("failed execution: " + i, doTest());
+ log.info("execution " + i + " PASES\n");
+ }
+ log.info(getName() + " PASSES");
+ }
+
+
+ public boolean doTest() throws Throwable
+ {
+ // Create client.
+ host = InetAddress.getLocalHost().getHostAddress();
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "10000");
+ clientConfig.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "20000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connections.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Add ConnectionListener.
+ TestConnectionListener listener = new TestConnectionListener();
+ client.addConnectionListener(listener);
+
+ // Wait for notification.
+ for (int i = 0; i < 20; i++)
+ {
+ if (listener.ok)
+ {
+ break;
+ }
+ Thread.sleep(1000);
+ }
+
+ client.disconnect();
+ return listener.ok;
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+
+
+ static class TestConnectionListener implements ConnectionListener
+ {
+ public boolean ok;
+
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ ok = true;
+ log.info("handleConnectionException() called");
+ }
+ }
+}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
___________________________________________________________________
Name: svn:executable
+ *
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-29 07:09:01 UTC (rev 4745)
@@ -0,0 +1,162 @@
+package org.jboss.test.remoting.connection.deadlock;
+
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.logging.XLevel;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ConnectionListener;
+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.transport.socket.SocketServerInvoker;
+
+
+public class DeadlockTestServer extends TestCase
+{
+ private static Logger log = Logger.getLogger(DeadlockTestServer.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port = 7777;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected TestServerInvoker serverInvoker;
+ protected TestInvocationHandler invocationHandler;
+
+
+ public static void main(String[] args)
+ {
+ try
+ {
+ DeadlockTestServer server = new DeadlockTestServer();
+ server.setUp();
+ server.setupServer();
+ Thread.sleep(600000);
+ server.shutdownServer();
+ }
+ catch (Throwable t)
+ {
+ log.error("error", t);
+ }
+ }
+
+
+ public void setUp()
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraServerConfig(config);
+
+ serverInvoker = new TestServerInvoker(serverLocator, config);
+ serverInvoker.create();
+ invocationHandler = new TestInvocationHandler();
+ serverInvoker.addInvocationHandler("test", invocationHandler);
+ serverInvoker.start();
+ log.info("TestServerInvoker(" + locatorURI + ") started");
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (serverInvoker != null)
+ serverInvoker.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ return invocation.getParameter();
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+ static class TestServerInvoker extends SocketServerInvoker
+ {
+ public TestServerInvoker(InvokerLocator locator, Map config)
+ {
+ super(locator, config);
+ log.info("TestServerInvoker: " + locator);
+ }
+ public Object invoke(InvocationRequest invocation) throws Throwable
+ {
+ if ("$PING$".equals(invocation.getParameter()))
+ {
+ log.info("TestServerInvoker received $PING$");
+ Thread.sleep(20000);
+ throw new Exception("got $PING$");
+ }
+ else
+ {
+ return super.invoke(invocation);
+ }
+ }
+ }
+
+ static class TestConnectionListener implements ConnectionListener
+ {
+ public boolean ok;
+
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ ok = true;
+ log.info("handleConnectionException() called");
+ }
+ }
+}
\ No newline at end of file
Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
___________________________________________________________________
Name: svn:executable
+ *
16 years, 11 months