JBoss Remoting SVN: r4925 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-04 23:55:07 -0400 (Sat, 04 Apr 2009)
New Revision: 4925
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
Log:
JBREM-1112: Fixed InvokerLocator in a couple of places to accommodate metadata.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-04-04 21:40:11 UTC (rev 4924)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-04-05 03:55:07 UTC (rev 4925)
@@ -225,8 +225,9 @@
// Create client.
String clientLocatorURI = locatorURI;
- clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+ clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=0";
+ log.info("clientLocatorURI: " + clientLocatorURI);
InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
HashMap clientConfig = new HashMap();
clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
@@ -268,8 +269,9 @@
// Create client.
String clientLocatorURI = locatorURI;
- clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+ clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=10000";
+ log.info("clientLocatorURI: " + clientLocatorURI);
InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
HashMap clientConfig = new HashMap();
clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
@@ -478,11 +480,11 @@
InvokerRegistry.registerInvokerFactories("socket", org.jboss.remoting.transport.socket.TransportClientFactory.class, TestServerInvokerFactory.class);
host = InetAddress.getLocalHost().getHostAddress();
port = PortUtil.findFreePort(host);
- locatorURI = getTransport() + "://" + host + ":" + port;
+ locatorURI = getTransport() + "://" + host + ":" + port + "/?x=x";
String metadata = System.getProperty("remoting.metadata");
if (metadata != null)
{
- locatorURI += "/?" + metadata;
+ locatorURI += "&" + metadata;
}
serverLocator = new InvokerLocator(locatorURI);
log.info("Starting remoting server with locator uri of: " + locatorURI);
15 years, 10 months
JBoss Remoting SVN: r4924 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-04 17:40:11 -0400 (Sat, 04 Apr 2009)
New Revision: 4924
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java
Log:
JBREM-1082: Subclassed Client returns non-null configuration map.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java 2009-04-04 04:40:18 UTC (rev 4923)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java 2009-04-04 21:40:11 UTC (rev 4924)
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
+import java.util.HashMap;
import java.util.Map;
import junit.framework.TestCase;
@@ -23,7 +24,7 @@
ConnectionValidator cv = new ConnectionValidator(new Client() {
public Map getConfiguration()
{
- return null;
+ return new HashMap();
}
public ClientInvoker getInvoker()
15 years, 10 months
JBoss Remoting SVN: r4923 - remoting2/branches/2.2/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-04 00:40:18 -0400 (Sat, 04 Apr 2009)
New Revision: 4923
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
Log:
JBREM-1102: getMarshaller() and getUnMarshaller() can look in configuration map as well as InvokerLocator.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2009-04-04 04:37:08 UTC (rev 4922)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2009-04-04 04:40:18 UTC (rev 4923)
@@ -72,7 +72,7 @@
if (marshaller == null)
{
// try by locator (in case marshaller class name specified)
- marshaller = MarshalFactory.getMarshaller(getLocator(), getClassLoader());
+ marshaller = MarshalFactory.getMarshaller(getLocator(), getClassLoader(), configuration);
if (marshaller == null)
{
// need to have a marshaller, so create a default one
@@ -103,7 +103,7 @@
}
// try by locator (in case unmarshaller class name specified)
- unmarshaller = MarshalFactory.getUnMarshaller(getLocator(), getClassLoader());
+ unmarshaller = MarshalFactory.getUnMarshaller(getLocator(), getClassLoader(), configuration);
if (unmarshaller == null)
{
unmarshaller = MarshalFactory.getUnMarshaller(getDataType(), getSerializationType());
@@ -465,11 +465,12 @@
{
if (dataType == null)
{
- dataType = getDataType(getLocator());
- if (dataType == null)
+ String localDataType = getDataType(getLocator());
+ if (localDataType == null)
{
- dataType = getDefaultDataType();
+ localDataType = getDefaultDataType();
}
+ dataType = localDataType;
}
return dataType;
}
15 years, 10 months
JBoss Remoting SVN: r4922 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/config.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-04 00:37:08 -0400 (Sat, 04 Apr 2009)
New Revision: 4922
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java
Log:
JBREM-1102: Corrected log message.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java 2009-04-03 23:31:44 UTC (rev 4921)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java 2009-04-04 04:37:08 UTC (rev 4922)
@@ -59,7 +59,7 @@
public static boolean ok(int count)
{
- log.info("wrote: " + wrote + ", count: " + count);
+ log.info("wrote: " + wrote + ", cloned: " + cloned);
return wrote && cloned == count;
}
15 years, 10 months
JBoss Remoting SVN: r4921 - in remoting2/branches/2.2.2-SP11_JBREM-1112/src: tests/org/jboss/test/remoting/connection and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: jbertram(a)redhat.com
Date: 2009-04-03 19:31:44 -0400 (Fri, 03 Apr 2009)
New Revision: 4921
Added:
remoting2/branches/2.2.2-SP11_JBREM-1112/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
Modified:
remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/ConnectionValidator.java
remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/Lease.java
remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/LeasePinger.java
Log:
[JBPAPP-1861]
Modified: remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/ConnectionValidator.java
===================================================================
--- remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/ConnectionValidator.java 2009-04-03 23:21:48 UTC (rev 4920)
+++ remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/ConnectionValidator.java 2009-04-03 23:31:44 UTC (rev 4921)
@@ -69,12 +69,18 @@
* of active lease on server side. Default value is "true".
*/
public static final String TIE_TO_LEASE = "tieToLease";
+
/**
* Key to determine whether to stop ConnectionValidator when PING fails.
* Default value is "true".
*/
public static final String STOP_LEASE_ON_FAILURE = "stopLeaseOnFailure";
+ /**
+ * Key to determine value of disconnectTimeout upon connection failure.
+ */
+ public static final String FAILURE_DISCONNECT_TIMEOUT = "failureDisconnectTimeout";
+
// Static ---------------------------------------------------------------------------------------
private static boolean trace = log.isTraceEnabled();
@@ -234,6 +240,7 @@
private boolean tieToLease = true;
private boolean stopLeaseOnFailure = true;
private int pingTimeout;
+ private int failureDisconnectTimeout = -1;
private boolean isValid;
private Timer timer;
@@ -404,7 +411,7 @@
public String toString()
{
- return "ConnectionValidator[" + clientInvoker + ", pingPeriod=" + pingPeriod + " ms]";
+ return "ConnectionValidator[" + Integer.toHexString(System.identityHashCode(this)) + ":" + clientInvoker + ", pingPeriod=" + pingPeriod + " ms]";
}
// Package protected ----------------------------------------------------------------------------
@@ -498,6 +505,28 @@
" to a boolean: must be a String");
}
}
+
+ o = config.get(FAILURE_DISCONNECT_TIMEOUT);
+ if (o != null)
+ {
+ if (o instanceof String)
+ {
+ try
+ {
+ failureDisconnectTimeout = Integer.valueOf(((String) o)).intValue();
+ }
+ catch (Exception e)
+ {
+ log.warn(this + " could not convert " + FAILURE_DISCONNECT_TIMEOUT + " value" +
+ " to an int: " + o);
+ }
+ }
+ else
+ {
+ log.warn(this + " could not convert " + FAILURE_DISCONNECT_TIMEOUT + " value" +
+ " to an int: must be a String");
+ }
+ }
}
}
@@ -638,6 +667,7 @@
{
public void run()
{
+ log.debug(this + " calling " + listener + ".handleConnectionException()");
listener.handleConnectionException(t, client);
}
}.start();
@@ -679,7 +709,7 @@
if (!isValid)
{
- log.debug(ConnectionValidator.this + "'s connections is invalid");
+ log.debug(ConnectionValidator.this + "'s connection is invalid");
notifyListeners(new Exception("Could not connect to server!"));
@@ -690,7 +720,8 @@
if (invoker != null)
{
- invoker.terminateLease(null, client.getDisconnectTimeout());
+ int disconnectTimeout = (failureDisconnectTimeout == -1) ? client.getDisconnectTimeout() : failureDisconnectTimeout;
+ invoker.terminateLease(null, disconnectTimeout);
log.debug(ConnectionValidator.this + " shut down lease pinger");
}
else
Modified: remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/Lease.java
===================================================================
--- remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/Lease.java 2009-04-03 23:21:48 UTC (rev 4920)
+++ remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/Lease.java 2009-04-03 23:31:44 UTC (rev 4921)
@@ -219,6 +219,7 @@
}
else
{
+ log.debug("requestPayload == null, calling ConnectionNotifier.connectionTerminated()");
notifier.connectionTerminated(locatorURL, clientSessionId, null);
}
}
Modified: remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/LeasePinger.java
===================================================================
--- remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/LeasePinger.java 2009-04-03 23:21:48 UTC (rev 4920)
+++ remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/LeasePinger.java 2009-04-03 23:31:44 UTC (rev 4921)
@@ -81,6 +81,7 @@
HashMap metadata = null;
// If disconnectTimeout == 0, skip network i/o.
+ log.debug(this + ": disconnectTimeout: " + disconnectTimeout);
if (disconnectTimeout != 0)
{
if (disconnectTimeout > 0)
Copied: remoting2/branches/2.2.2-SP11_JBREM-1112/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java (from rev 4914, remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java)
===================================================================
--- remoting2/branches/2.2.2-SP11_JBREM-1112/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java (rev 0)
+++ remoting2/branches/2.2.2-SP11_JBREM-1112/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-04-03 23:31:44 UTC (rev 4921)
@@ -0,0 +1,592 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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;
+
+import java.io.IOException;
+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.ClientDisconnectedException;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.ConnectionValidator;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.InvokerRegistry;
+import org.jboss.remoting.ServerInvocationHandler;
+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.ServerFactory;
+import org.jboss.remoting.transport.socket.SocketServerInvoker;
+
+
+/**
+ * Unit test for JBREM-1112.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Apr 3, 2009
+ * </p>
+ */
+public class ConnectionValidatorDisconnectTimeoutTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(ConnectionValidatorDisconnectTimeoutTestCase.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+ protected TestConnectionListener serverConnectionListener;
+
+
+ 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 testDefaultUnary() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener);
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.removeConnectionListener(clientConnectionListener);
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testDefaultFirstBinary() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, 500);
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.removeConnectionListener(clientConnectionListener);
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testDefaultSecondBinary() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.removeConnectionListener(clientConnectionListener);
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testZeroInvokerLocator() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ String clientLocatorURI = locatorURI;
+ clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+ clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=0";
+ InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(8000);
+ assertTrue(serverConnectionListener.notified);
+ assertNull(serverConnectionListener.throwable);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.removeConnectionListener(clientConnectionListener);
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testNonZeroInvokerLocator() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ String clientLocatorURI = locatorURI;
+ clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+ clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=10000";
+ InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testZeroConfig() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ clientConfig.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "0");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(8000);
+ assertTrue(serverConnectionListener.notified);
+ assertNull(serverConnectionListener.throwable);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testNonZeroConfig() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ clientConfig.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "10000");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testZeroMetadata() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ HashMap metadata = new HashMap();
+ metadata.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "0");
+ client.addConnectionListener(clientConnectionListener, metadata);
+
+ // Wait for broken connection and test.
+ Thread.sleep(8000);
+ assertTrue(serverConnectionListener.notified);
+ assertNull(serverConnectionListener.throwable);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testNonZeroMetadata() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ HashMap metadata = new HashMap();
+ metadata.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "10000");
+ client.addConnectionListener(clientConnectionListener, metadata);
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ InvokerRegistry.registerInvokerFactories("socket", org.jboss.remoting.transport.socket.TransportClientFactory.class, TestServerInvokerFactory.class);
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ 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");
+ config.put("leasePeriod", "1000");
+ addExtraServerConfig(config);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ serverConnectionListener = new TestConnectionListener("SERVER");
+ connector.addConnectionListener(serverConnectionListener);
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.stop();
+ }
+
+
+ static class TestServerInvoker extends SocketServerInvoker
+ {
+ public TestServerInvoker(InvokerLocator locator, Map configuration)
+ {
+ super(locator, configuration);
+ }
+
+ public Object invoke(InvocationRequest invocation) throws Throwable
+ {
+ Object param = invocation.getParameter();
+
+ // check to see if this is a is alive ping
+ if ("$PING$".equals(param))
+ {
+ Map metadata = invocation.getRequestPayload();
+ if (metadata != null)
+ {
+ String invokerSessionId = (String) metadata.get(INVOKER_SESSION_ID);
+ if (invokerSessionId != null)
+ {
+ // Comes from ConnectionValidator configured to tie validation with lease.
+ log.info(this + " responding FALSE to $PING$ for invoker sessionId " + invokerSessionId);
+ return Boolean.FALSE;
+ }
+ }
+ }
+
+ return super.invoke(invocation);
+ }
+ }
+
+
+ public static class TestServerInvokerFactory implements ServerFactory
+ {
+ public ServerInvoker createServerInvoker(InvokerLocator locator, Map config) throws IOException
+ {
+ return new TestServerInvoker(locator, config);
+ }
+
+ public boolean supportsSSL()
+ {
+ return false;
+ }
+ }
+
+
+ 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 TestConnectionListener implements ConnectionListener
+ {
+ public boolean notified;
+ public Throwable throwable;
+ String name;
+
+ TestConnectionListener(String name)
+ {
+ this.name = name;
+ }
+
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ notified = true;
+ this.throwable = throwable;
+ log.info(this + " NOTIFIED, throwable = " + throwable);
+ }
+
+ public String toString()
+ {
+ return "TestConnectionListener[" + name + "]";
+ }
+ }
+}
\ No newline at end of file
15 years, 10 months
JBoss Remoting SVN: r4920 - remoting2/branches.
by jboss-remoting-commits＠lists.jboss.org
Author: jbertram(a)redhat.com
Date: 2009-04-03 19:21:48 -0400 (Fri, 03 Apr 2009)
New Revision: 4920
Added:
remoting2/branches/2.2.2-SP11_JBREM-1112/
Log:
[JBPAPP-1861] create patch branch
Copied: remoting2/branches/2.2.2-SP11_JBREM-1112 (from rev 4919, remoting2/tags/2.2.2-SP11)
15 years, 10 months
JBoss Remoting SVN: r4919 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-03 02:49:35 -0400 (Fri, 03 Apr 2009)
New Revision: 4919
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/Lease.java
Log:
JBREM-1112: Added log.debug() when requestPayload is null.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Lease.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Lease.java 2009-04-03 06:48:12 UTC (rev 4918)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Lease.java 2009-04-03 06:49:35 UTC (rev 4919)
@@ -219,6 +219,7 @@
}
else
{
+ log.debug("requestPayload == null, calling ConnectionNotifier.connectionTerminated()");
notifier.connectionTerminated(locatorURL, clientSessionId, null);
}
}
15 years, 10 months
JBoss Remoting SVN: r4918 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-03 02:48:12 -0400 (Fri, 03 Apr 2009)
New Revision: 4918
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/LeasePinger.java
Log:
JBREM-1112: Added log.debug() call with disconnectTimeout.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/LeasePinger.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/LeasePinger.java 2009-04-03 06:44:46 UTC (rev 4917)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/LeasePinger.java 2009-04-03 06:48:12 UTC (rev 4918)
@@ -115,6 +115,7 @@
HashMap metadata = null;
// If disconnectTimeout == 0, skip network i/o.
+ log.debug(this + ": disconnectTimeout: " + disconnectTimeout);
if (disconnectTimeout != 0)
{
if (disconnectTimeout > 0)
15 years, 10 months
JBoss Remoting SVN: r4917 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-03 02:44:46 -0400 (Fri, 03 Apr 2009)
New Revision: 4917
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java
Log:
JBREM-1112: Introduced failureDisconnectTimeout variable.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java 2009-04-03 06:43:56 UTC (rev 4916)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java 2009-04-03 06:44:46 UTC (rev 4917)
@@ -72,12 +72,18 @@
* of active lease on server side. Default value is "true".
*/
public static final String TIE_TO_LEASE = "tieToLease";
+
/**
* Key to determine whether to stop ConnectionValidator when PING fails.
* Default value is "true".
*/
public static final String STOP_LEASE_ON_FAILURE = "stopLeaseOnFailure";
+ /**
+ * Key to determine value of disconnectTimeout upon connection failure.
+ */
+ public static final String FAILURE_DISCONNECT_TIMEOUT = "failureDisconnectTimeout";
+
// Static ---------------------------------------------------------------------------------------
private static boolean trace = log.isTraceEnabled();
@@ -236,6 +242,7 @@
private boolean tieToLease = true;
private boolean stopLeaseOnFailure = true;
private int pingTimeout;
+ private int failureDisconnectTimeout = -1;
private boolean isValid;
private Timer timer;
@@ -408,7 +415,7 @@
public String toString()
{
- return "ConnectionValidator[" + clientInvoker + ", pingPeriod=" + pingPeriod + " ms]";
+ return "ConnectionValidator[" + Integer.toHexString(System.identityHashCode(this)) + ":" + clientInvoker + ", pingPeriod=" + pingPeriod + " ms]";
}
// Package protected ----------------------------------------------------------------------------
@@ -576,6 +583,28 @@
" to a boolean: must be a String");
}
}
+
+ o = config.get(FAILURE_DISCONNECT_TIMEOUT);
+ if (o != null)
+ {
+ if (o instanceof String)
+ {
+ try
+ {
+ failureDisconnectTimeout = Integer.valueOf(((String) o)).intValue();
+ }
+ catch (Exception e)
+ {
+ log.warn(this + " could not convert " + FAILURE_DISCONNECT_TIMEOUT + " value" +
+ " to an int: " + o);
+ }
+ }
+ else
+ {
+ log.warn(this + " could not convert " + FAILURE_DISCONNECT_TIMEOUT + " value" +
+ " to an int: must be a String");
+ }
+ }
}
}
@@ -716,6 +745,7 @@
{
public void run()
{
+ log.debug(this + " calling " + listener + ".handleConnectionException()");
listener.handleConnectionException(t, client);
}
}.start();
@@ -757,7 +787,7 @@
if (!isValid)
{
- log.debug(ConnectionValidator.this + "'s connections is invalid");
+ log.debug(ConnectionValidator.this + "'s connection is invalid");
notifyListeners(new Exception("Could not connect to server!"));
@@ -768,7 +798,8 @@
if (invoker != null)
{
- invoker.terminateLease(null, client.getDisconnectTimeout());
+ int disconnectTimeout = (failureDisconnectTimeout == -1) ? client.getDisconnectTimeout() : failureDisconnectTimeout;
+ invoker.terminateLease(null, disconnectTimeout);
log.debug(ConnectionValidator.this + " shut down lease pinger");
}
else
15 years, 10 months
JBoss Remoting SVN: r4916 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-03 02:43:56 -0400 (Fri, 03 Apr 2009)
New Revision: 4916
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
Log:
JBREM-1112: New unit tests.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-04-03 06:43:56 UTC (rev 4916)
@@ -0,0 +1,592 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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;
+
+import java.io.IOException;
+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.ClientDisconnectedException;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.ConnectionValidator;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.InvokerRegistry;
+import org.jboss.remoting.ServerInvocationHandler;
+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.ServerFactory;
+import org.jboss.remoting.transport.socket.SocketServerInvoker;
+
+
+/**
+ * Unit test for JBREM-1112.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Apr 3, 2009
+ * </p>
+ */
+public class ConnectionValidatorDisconnectTimeoutTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(ConnectionValidatorDisconnectTimeoutTestCase.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+ protected TestConnectionListener serverConnectionListener;
+
+
+ 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 testDefaultUnary() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener);
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.removeConnectionListener(clientConnectionListener);
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testDefaultFirstBinary() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, 500);
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.removeConnectionListener(clientConnectionListener);
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testDefaultSecondBinary() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.removeConnectionListener(clientConnectionListener);
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testZeroInvokerLocator() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ String clientLocatorURI = locatorURI;
+ clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+ clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=0";
+ InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(8000);
+ assertTrue(serverConnectionListener.notified);
+ assertNull(serverConnectionListener.throwable);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.removeConnectionListener(clientConnectionListener);
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testNonZeroInvokerLocator() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ String clientLocatorURI = locatorURI;
+ clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+ clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=10000";
+ InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testZeroConfig() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ clientConfig.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "0");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(8000);
+ assertTrue(serverConnectionListener.notified);
+ assertNull(serverConnectionListener.throwable);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testNonZeroConfig() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ clientConfig.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "10000");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ client.addConnectionListener(clientConnectionListener, new HashMap());
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testZeroMetadata() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ HashMap metadata = new HashMap();
+ metadata.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "0");
+ client.addConnectionListener(clientConnectionListener, metadata);
+
+ // Wait for broken connection and test.
+ Thread.sleep(8000);
+ assertTrue(serverConnectionListener.notified);
+ assertNull(serverConnectionListener.throwable);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testNonZeroMetadata() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Client.ENABLE_LEASE, "true");
+ 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");
+
+ // Install ConnectionListener.
+ TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+ HashMap metadata = new HashMap();
+ metadata.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "10000");
+ client.addConnectionListener(clientConnectionListener, metadata);
+
+ // Wait for broken connection and test.
+ Thread.sleep(4000);
+ assertTrue(serverConnectionListener.notified);
+ assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+ assertTrue(clientConnectionListener.notified);
+ assertTrue(clientConnectionListener.throwable instanceof Exception);
+ assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ InvokerRegistry.registerInvokerFactories("socket", org.jboss.remoting.transport.socket.TransportClientFactory.class, TestServerInvokerFactory.class);
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ 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");
+ config.put("leasePeriod", "1000");
+ addExtraServerConfig(config);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ serverConnectionListener = new TestConnectionListener("SERVER");
+ connector.addConnectionListener(serverConnectionListener);
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.stop();
+ }
+
+
+ static class TestServerInvoker extends SocketServerInvoker
+ {
+ public TestServerInvoker(InvokerLocator locator, Map configuration)
+ {
+ super(locator, configuration);
+ }
+
+ public Object invoke(InvocationRequest invocation) throws Throwable
+ {
+ Object param = invocation.getParameter();
+
+ // check to see if this is a is alive ping
+ if ("$PING$".equals(param))
+ {
+ Map metadata = invocation.getRequestPayload();
+ if (metadata != null)
+ {
+ String invokerSessionId = (String) metadata.get(INVOKER_SESSION_ID);
+ if (invokerSessionId != null)
+ {
+ // Comes from ConnectionValidator configured to tie validation with lease.
+ log.info(this + " responding FALSE to $PING$ for invoker sessionId " + invokerSessionId);
+ return Boolean.FALSE;
+ }
+ }
+ }
+
+ return super.invoke(invocation);
+ }
+ }
+
+
+ public static class TestServerInvokerFactory implements ServerFactory
+ {
+ public ServerInvoker createServerInvoker(InvokerLocator locator, Map config) throws IOException
+ {
+ return new TestServerInvoker(locator, config);
+ }
+
+ public boolean supportsSSL()
+ {
+ return false;
+ }
+ }
+
+
+ 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 TestConnectionListener implements ConnectionListener
+ {
+ public boolean notified;
+ public Throwable throwable;
+ String name;
+
+ TestConnectionListener(String name)
+ {
+ this.name = name;
+ }
+
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ notified = true;
+ this.throwable = throwable;
+ log.info(this + " NOTIFIED, throwable = " + throwable);
+ }
+
+ public String toString()
+ {
+ return "TestConnectionListener[" + name + "]";
+ }
+ }
+}
\ No newline at end of file
15 years, 10 months