JBoss Remoting SVN: r5716 - remoting2/branches/2.2/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-17 14:11:28 -0500 (Wed, 17 Feb 2010)
New Revision: 5716
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java
Log:
JBREM-1180: Checks for null host, possibly indicating an ill-formed URI.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java 2010-02-17 15:50:32 UTC (rev 5715)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java 2010-02-17 19:11:28 UTC (rev 5716)
@@ -235,6 +235,11 @@
public static final String LEGACY_PARSING = "legacyParsing";
/**
+ * Constant to determine if warning about null host should be logged.
+ */
+ public static final String SUPPRESS_HOST_WARNING = "suppressHostWarning";
+
+ /**
* Constructs the object used to identify a remoting server via simple uri format string (e.g. socket://myhost:7000).
* Note: the uri passed may not always be the one returned via call to getLocatorURI() as may need to change if
* port not specified, host is 0.0.0.0, etc. If need original uri that is passed to this constructor, need to
@@ -310,6 +315,7 @@
{
URI uri = new URI(encodePercent(uriString));
protocol = uri.getScheme();
+ checkHost(originalURL, uri.getHost());
host = decodePercent(resolveHost(uri.getHost()));
port = uri.getPort();
path = uri.getPath();
@@ -384,6 +390,17 @@
}
}
+ private static void checkHost(String uri, String host)
+ {
+ if (host == null && !Boolean.getBoolean(SUPPRESS_HOST_WARNING))
+ {
+ StringBuffer sb = new StringBuffer("Host resolves to null in ");
+ sb.append(uri).append(". Perhaps the host contains an invalid character. ");
+ sb.append("See http://www.ietf.org/rfc/rfc2396.txt.");
+ log.warn(sb.toString());
+ }
+ }
+
private static final String resolveHost(String host)
{
if (host == null)
14 years, 9 months
JBoss Remoting SVN: r5715 - remoting2/branches/2.2.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-17 10:50:32 -0500 (Wed, 17 Feb 2010)
New Revision: 5715
Modified:
remoting2/branches/2.2/build.xml
Log:
JBREM-1161: Moved findbugs taskdef inside findbugs target so ant won't look for findbugs unless the findbugs target is executed.
Modified: remoting2/branches/2.2/build.xml
===================================================================
--- remoting2/branches/2.2/build.xml 2010-02-17 15:48:26 UTC (rev 5714)
+++ remoting2/branches/2.2/build.xml 2010-02-17 15:50:32 UTC (rev 5715)
@@ -3910,10 +3910,9 @@
<delete dir="${dist.dir}"/>
</target>
-
- <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
<target name="findbugs" depends="jars">
+ <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
<findbugs home="${findbugs.home}" output="html" outputFile="${output.dir}/findbugs.html" >
<class location="${output.lib.dir}/jboss-remoting.jar" />
<sourcePath path="${src.dir}" />
14 years, 9 months
JBoss Remoting SVN: r5714 - remoting2/branches/2.x.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-17 10:48:26 -0500 (Wed, 17 Feb 2010)
New Revision: 5714
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-1161: Moved findbugs taskdef inside findbugs target so ant won't look for findbugs unless the findbugs target is executed.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2010-02-17 04:42:07 UTC (rev 5713)
+++ remoting2/branches/2.x/build.xml 2010-02-17 15:48:26 UTC (rev 5714)
@@ -743,7 +743,7 @@
manifest="${manifest.file}">
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/samples/**"/>
- <include name="org/jboss/remoting/transport/bisocket/BisocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/bisocket/BisocketClientInvoker*"/>
<include name="org/jboss/remoting/transport/bisocket/BisocketServerInvoker*"/>
<include name="org/jboss/remoting/transport/multiplex/**"/>
</fileset>
@@ -1730,7 +1730,7 @@
<antcall target="tests.servlet.marshal" inheritrefs="true"/>
<antcall target="tests.servlet.marshal.config" inheritrefs="true"/>
<antcall target="tests.servlet.marshal.noconfig" inheritrefs="true"/>
- <antcall target="tests.servlet.mbeanserver.jboss" inheritrefs="true"/>
+ <antcall target="tests.servlet.mbeanserver.jboss" inheritrefs="true"/>
<antcall target="tests.servlet.multihome" inheritrefs="true"/>
<antcall target="tests.servlet.nopreservelines" inheritrefs="true"/>
<antcall target="tests.servlet.preservelines" inheritrefs="true"/>
@@ -2280,7 +2280,7 @@
</antcall>
<!-- ******************************************************************************** -->
- <!-- Current <- -> 2.5.1 -->
+ <!-- Current <- -> 2.5.1 -->
<antcall target="download.version">
<param name="version" value="2.5.1"/>
</antcall>
@@ -4613,9 +4613,8 @@
<!--delete dir="${dist.dir}"/-->
</target>
- <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
-
<target name="findbugs" depends="jars">
+ <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
<findbugs home="${findbugs.home}" output="html" outputFile="${output.dir}/findbugs.html" >
<class location="${output.lib.dir}/jboss-remoting.jar" />
<sourcePath path="${src.dir}" />
14 years, 9 months
JBoss Remoting SVN: r5713 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-16 23:42:07 -0500 (Tue, 16 Feb 2010)
New Revision: 5713
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java
Log:
JBREM-1183: New unit tests.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java 2010-02-17 04:42:07 UTC (rev 5713)
@@ -0,0 +1,328 @@
+/*
+ * 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.transport.socket;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.LinkedList;
+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.remoting.Client;
+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.ClientFactory;
+import org.jboss.remoting.transport.ClientInvoker;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.transport.ServerFactory;
+import org.jboss.remoting.transport.socket.LRUPool;
+import org.jboss.remoting.transport.socket.ServerSocketWrapper;
+import org.jboss.remoting.transport.socket.ServerThread;
+import org.jboss.remoting.transport.socket.SocketClientInvoker;
+import org.jboss.remoting.transport.socket.SocketServerInvoker;
+import org.jboss.remoting.transport.socket.SocketWrapper;
+
+
+/**
+ * Unit tests for JBREM-1183.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 16, 2010
+ */
+public class ErrorTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(ErrorTestCase.class);
+
+ private static boolean firstTime = true;
+ private static int whenToFail;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+
+
+ 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);
+ }
+ InvokerRegistry.registerInvokerFactories(getTransport(), TestClientFactory.class, TestServerFactory.class);
+ TestServerThread.threadCounter = 0;
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testErrorFirstTime() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ whenToFail = 0;
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put("timeout", "2000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test invocations.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("first invocation succeeded");
+ assertEquals("lmn", client.invoke("lmn"));
+ log.info("second invocation succeeded");
+ assertEquals("xyz", client.invoke("xyz"));
+ log.info("third invocation succeeded");
+ assertEquals(1, TestServerThread.threadCounter);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testErrorSecondTime() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ whenToFail = 1;
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put("timeout", "2000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test invocations.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("first invocation succeeded");
+ assertEquals("lmn", client.invoke("lmn"));
+ log.info("second invocation succeeded");
+ assertEquals("xyz", client.invoke("xyz"));
+ log.info("third invocation succeeded");
+ assertEquals(1, TestServerThread.threadCounter);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testErrorThirdTime() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ whenToFail = 2;
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put("timeout", "2000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test invocations.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("first invocation succeeded");
+ assertEquals("lmn", client.invoke("lmn"));
+ log.info("second invocation succeeded");
+ assertEquals("xyz", client.invoke("xyz"));
+ log.info("third invocation succeeded");
+ assertEquals(1, TestServerThread.threadCounter);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "test";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ 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");
+ addExtraServerConfig(config);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.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
+ {
+ int counter;
+
+ public TestServerInvoker(InvokerLocator locator, Map configuration)
+ {
+ super(locator, configuration);
+ }
+ public TestServerInvoker(InvokerLocator locator)
+ {
+ super(locator);
+ }
+ protected void processInvocation(Socket socket) throws Exception
+ {
+ clientpool = new LRUPool(2, maxPoolSize);
+ clientpool.create();
+ threadpool = new LinkedList();
+ ServerThread worker = new TestServerThread(socket, this, clientpool, threadpool, 0, 0, ServerSocketWrapper.class.getName());
+ worker.start();
+ }
+ }
+
+
+ public static class TestServerThread extends ServerThread
+ {
+ static public int threadCounter;
+ private int counter;
+
+ public TestServerThread(Socket socket, SocketServerInvoker invoker, LRUPool clientpool, LinkedList threadpool,
+ int timeout, int writeTimeout, String serverSocketClassName) throws Exception
+ {
+ super(socket, invoker, clientpool, threadpool, timeout, writeTimeout, serverSocketClassName);
+ threadCounter++;
+ }
+ protected void processInvocation(SocketWrapper socketWrapper, InputStream inputStream, OutputStream outputStream) throws Exception
+ {
+ super.processInvocation(socketWrapper, inputStream, outputStream);
+ if (counter++ == whenToFail)
+ throw new Error("TestServerThread");
+ }
+ }
+
+
+ public static class TestClientFactory implements ClientFactory
+ {
+ public ClientInvoker createClientInvoker(InvokerLocator locator, Map config) throws IOException
+ {
+ log.info("TestClientFaotory.createClientInvoker() called");
+ return new SocketClientInvoker(locator, config);
+ }
+ public boolean supportsSSL()
+ {
+ return false;
+ }
+ }
+
+
+ public static class TestServerFactory implements ServerFactory
+ {
+ public ServerInvoker createServerInvoker(InvokerLocator locator, Map config) throws IOException
+ {
+ log.info("TestServerFactory.createServerInvoker() called");
+ return new TestServerInvoker(locator, config);
+ }
+ public boolean supportsSSL()
+ {
+ return false;
+ }
+ }
+}
\ No newline at end of file
14 years, 9 months
JBoss Remoting SVN: r5712 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-16 23:41:48 -0500 (Tue, 16 Feb 2010)
New Revision: 5712
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java
Log:
JBREM-1183: doRun() handles java.lang.Error's.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java 2010-02-17 04:41:09 UTC (rev 5711)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java 2010-02-17 04:41:48 UTC (rev 5712)
@@ -559,6 +559,17 @@
log.debug(this + " exception occurred during first invocation", ex);
}
}
+ catch (Error e)
+ {
+ if (!shutdown)
+ {
+ log.error("error", e);
+ }
+ else
+ {
+ log.debug("error", e);
+ }
+ }
// Re-use loop
while (running)
@@ -644,6 +655,18 @@
}
running = false;
}
+ catch (Error e)
+ {
+ if (!shutdown)
+ {
+ log.error("error", e);
+ }
+ else
+ {
+ log.debug("error", e);
+ }
+ }
+
// clear any interruption so that thread can be pooled.
Thread.interrupted();
}
14 years, 9 months
JBoss Remoting SVN: r5711 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-16 23:41:09 -0500 (Tue, 16 Feb 2010)
New Revision: 5711
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java
Log:
JBREM-1183: TestServerThread.processInvocation() creates clientpool and threadpool.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java 2010-02-17 04:32:18 UTC (rev 5710)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java 2010-02-17 04:41:09 UTC (rev 5711)
@@ -269,7 +269,10 @@
}
protected void processInvocation(Socket socket) throws Exception
{
- ServerThread worker = new TestServerThread(socket, this, null, null, 0, 0, ServerSocketWrapper.class.getName());
+ clientpool = new LRUPool(2, maxPoolSize);
+ clientpool.create();
+ threadpool = new LinkedList();
+ ServerThread worker = new TestServerThread(socket, this, clientpool, threadpool, 0, 0, ServerSocketWrapper.class.getName());
worker.start();
}
}
14 years, 9 months
JBoss Remoting SVN: r5710 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-16 23:32:18 -0500 (Tue, 16 Feb 2010)
New Revision: 5710
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java
Log:
JBREM-1183: New unit tests.
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ErrorTestCase.java 2010-02-17 04:32:18 UTC (rev 5710)
@@ -0,0 +1,324 @@
+/*
+ * 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.transport.socket;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.LinkedList;
+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.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.ClientFactory;
+import org.jboss.remoting.transport.ClientInvoker;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.transport.ServerFactory;
+import org.jboss.remoting.transport.socket.LRUPool;
+import org.jboss.remoting.transport.socket.ServerSocketWrapper;
+import org.jboss.remoting.transport.socket.ServerThread;
+import org.jboss.remoting.transport.socket.SocketClientInvoker;
+import org.jboss.remoting.transport.socket.SocketServerInvoker;
+import org.jboss.remoting.transport.socket.SocketWrapper;
+
+
+/**
+ * Unit tests for JBREM-1183.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Feb 16, 2010
+ */
+public class ErrorTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(ErrorTestCase.class);
+
+ private static boolean firstTime = true;
+ private static int whenToFail;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+
+
+ 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);
+ }
+ InvokerRegistry.registerInvokerFactories(getTransport(), TestClientFactory.class, TestServerFactory.class);
+ TestServerThread.threadCounter = 0;
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testErrorFirstTime() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ whenToFail = 0;
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put("timeout", "2000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test invocations.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("first invocation succeeded");
+ assertEquals("lmn", client.invoke("lmn"));
+ log.info("second invocation succeeded");
+ assertEquals("xyz", client.invoke("xyz"));
+ log.info("third invocation succeeded");
+ assertEquals(1, TestServerThread.threadCounter);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testErrorSecondTime() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ whenToFail = 1;
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put("timeout", "2000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test invocations.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("first invocation succeeded");
+ assertEquals("lmn", client.invoke("lmn"));
+ log.info("second invocation succeeded");
+ assertEquals("xyz", client.invoke("xyz"));
+ log.info("third invocation succeeded");
+ assertEquals(1, TestServerThread.threadCounter);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testErrorThirdTime() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ whenToFail = 2;
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put("timeout", "2000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test invocations.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("first invocation succeeded");
+ assertEquals("lmn", client.invoke("lmn"));
+ log.info("second invocation succeeded");
+ assertEquals("xyz", client.invoke("xyz"));
+ log.info("third invocation succeeded");
+ assertEquals(1, TestServerThread.threadCounter);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "test";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ 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");
+ addExtraServerConfig(config);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.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
+ {
+ int counter;
+
+ public TestServerInvoker(InvokerLocator locator, Map configuration)
+ {
+ super(locator, configuration);
+ }
+ public TestServerInvoker(InvokerLocator locator)
+ {
+ super(locator);
+ }
+ protected void processInvocation(Socket socket) throws Exception
+ {
+ ServerThread worker = new TestServerThread(socket, this, null, null, 0, 0, ServerSocketWrapper.class.getName());
+ worker.start();
+ }
+ }
+
+
+ public static class TestServerThread extends ServerThread
+ {
+ static public int threadCounter;
+ private int counter;
+
+ public TestServerThread(Socket socket, SocketServerInvoker invoker, LRUPool clientpool, LinkedList threadpool,
+ int timeout, int writeTimeout, String serverSocketClassName) throws Exception
+ {
+ super(socket, invoker, clientpool, threadpool, timeout, writeTimeout, serverSocketClassName);
+ threadCounter++;
+ }
+ protected void processInvocation(SocketWrapper socketWrapper) throws Exception
+ {
+ super.processInvocation(socketWrapper);
+ if (counter++ == whenToFail)
+ throw new Error("TestServerThread");
+ }
+ }
+
+
+ public static class TestClientFactory implements ClientFactory
+ {
+ public ClientInvoker createClientInvoker(InvokerLocator locator, Map config) throws IOException
+ {
+ log.info("TestClientFaotory.createClientInvoker() called");
+ return new SocketClientInvoker(locator, config);
+ }
+ public boolean supportsSSL()
+ {
+ return false;
+ }
+ }
+
+
+ public static class TestServerFactory implements ServerFactory
+ {
+ public ServerInvoker createServerInvoker(InvokerLocator locator, Map config) throws IOException
+ {
+ log.info("TestServerFactory.createServerInvoker() called");
+ return new TestServerInvoker(locator, config);
+ }
+ public boolean supportsSSL()
+ {
+ return false;
+ }
+ }
+}
\ No newline at end of file
14 years, 9 months
JBoss Remoting SVN: r5709 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-16 23:31:51 -0500 (Tue, 16 Feb 2010)
New Revision: 5709
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java
Log:
JBREM-1183: doRun() handles java.lang.Error's.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java 2010-02-16 20:38:32 UTC (rev 5708)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java 2010-02-17 04:31:51 UTC (rev 5709)
@@ -413,6 +413,17 @@
log.error("Worker thread initialization failure", ex);
running = false;
}
+ catch (Error e)
+ {
+ if (!shutdown)
+ {
+ log.error("error", e);
+ }
+ else
+ {
+ log.debug("error", e);
+ }
+ }
// Re-use loop
while (running)
@@ -487,6 +498,18 @@
running = false;
}
}
+ catch (Error e)
+ {
+ if (!shutdown)
+ {
+ log.error("error", e);
+ }
+ else
+ {
+ log.debug("error", e);
+ }
+ }
+
// clear any interruption so that thread can be pooled.
handlingResponse = false;
Thread.interrupted();
14 years, 9 months
JBoss Remoting SVN: r5708 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-16 15:38:32 -0500 (Tue, 16 Feb 2010)
New Revision: 5708
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java
Log:
JBREM-1182, JBREM-1164: Do conditionally tests that fail with jdk1.4.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java 2010-02-16 20:21:01 UTC (rev 5707)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java 2010-02-16 20:38:32 UTC (rev 5708)
@@ -91,7 +91,15 @@
assertTrue(doXMLTest("0:0:0:0:0:0:0:1", ++port));
assertTrue(doXMLTest("0:0:0:0:0:0:127.0.0.1", ++port));
assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf", ++port));
- assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", ++port));
+ String version = System.getProperty("java.version");
+ if (version.startsWith("1.4"))
+ {
+ log.info("java version is " + version + ". Skipping test");
+ }
+ else
+ {
+ assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", ++port));
+ }
log.info(getName() + " PASSES");
}
@@ -106,7 +114,15 @@
assertTrue(doXMLTest("[0:0:0:0:0:0:0:1]", ++port));
assertTrue(doXMLTest("[0:0:0:0:0:0:127.0.0.1]", ++port));
assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf]", ++port));
- assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", ++port));
+ String version = System.getProperty("java.version");
+ if (version.startsWith("1.4"))
+ {
+ log.info("java version is " + version + ". Skipping test");
+ }
+ else
+ {
+ assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", ++port));
+ }
log.info(getName() + " PASSES");
}
14 years, 9 months
JBoss Remoting SVN: r5707 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/shutdown.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-02-16 15:21:01 -0500 (Tue, 16 Feb 2010)
New Revision: 5707
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/shutdown/log4j.xml
Log:
JBREM-1182: Set log level to INFO.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/shutdown/log4j.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/shutdown/log4j.xml 2010-02-16 20:20:26 UTC (rev 5706)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/shutdown/log4j.xml 2010-02-16 20:21:01 UTC (rev 5707)
@@ -77,12 +77,12 @@
<category name="org.jboss.remoting">
- <priority value="trace" class="org.jboss.logging.XLevel"/>
+ <priority value="info" class="org.jboss.logging.XLevel"/>
</category>
<category name="org.jboss.test.remoting">
- <priority value="trace" class="org.jboss.logging.XLevel"/>
+ <priority value="info" class="org.jboss.logging.XLevel"/>
</category>
14 years, 9 months