JBoss Remoting SVN: r5431 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket: socketexception and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-02 13:23:54 -0400 (Wed, 02 Sep 2009)
New Revision: 5431
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception/
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java
Log:
JBREM-1146: New unit tests.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java 2009-09-02 17:23:54 UTC (rev 5431)
@@ -0,0 +1,505 @@
+/*
+ * 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.socketexception;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.rmi.MarshalException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+import javax.net.SocketFactory;
+
+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.Remoting;
+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;
+
+
+/**
+ * Unit tests for JBREM-1146.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Sep 2, 2009
+ * </p>
+ */
+public class GeneralizeSocketExceptionTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(GeneralizeSocketExceptionTestCase.class);
+ private static String connectionResetMessage = "yada yada connection reset yada yada";
+ private static String connectionClosedMessage = "yada yada connection closed yada yada";
+ private static String brokenPipeMessage = "yada yada broken pipe yada yada";
+
+ private static boolean firstTime = true;
+
+ 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.DEBUG);
+ 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);
+ }
+
+ TestOutputStream.counter = 0;
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testConnectionResetNotGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(connectionResetMessage), 2));
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation fails.
+ try
+ {
+ client.invoke("abc");
+ }
+ catch (MarshalException e)
+ {
+ Throwable t = e.getCause();
+ assertEquals(connectionResetMessage, t.getMessage());
+ }
+ catch (Throwable e)
+ {
+ fail("Expecteded message: " + connectionResetMessage + ", got: " + e.getMessage());
+ }
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testConnectionResetGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(connectionResetMessage), 2));
+ clientConfig.put("generalizeSocketException", "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation succeeds.
+ assertEquals("abc", client.invoke("abc"));
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testConnectionClosedNotGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(connectionClosedMessage), 2));
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation fails.
+ try
+ {
+ client.invoke("abc");
+ }
+ catch (MarshalException e)
+ {
+ Throwable t = e.getCause();
+ assertEquals(connectionClosedMessage, t.getMessage());
+ }
+ catch (Throwable e)
+ {
+ fail("Expecteded message: " + connectionClosedMessage + ", got: " + e.getMessage());
+ }
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testConnectionClosedGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(connectionClosedMessage), 2));
+ clientConfig.put("generalizeSocketException", "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation succeeds.
+ assertEquals("abc", client.invoke("abc"));
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testBrokedPipedNotGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(brokenPipeMessage), 2));
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation fails.
+ try
+ {
+ client.invoke("abc");
+ }
+ catch (MarshalException e)
+ {
+ Throwable t = e.getCause();
+ assertEquals(brokenPipeMessage, t.getMessage());
+ }
+ catch (Throwable e)
+ {
+ fail("Expecteded message: " + brokenPipeMessage + ", got: " + e.getMessage());
+ }
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testBrokedPipeGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(brokenPipeMessage), 2));
+ clientConfig.put("generalizeSocketException", "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation succeeds.
+ assertEquals("abc", client.invoke("abc"));
+
+ 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
+ {
+ 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) {}
+ }
+
+ public static class TestSocketFactory extends SocketFactory
+ {
+ IOException exception;
+ int throwOn = -1;
+
+ public TestSocketFactory()
+ {
+ exception = new SocketException("default");
+ }
+ public TestSocketFactory(IOException exception, int throwOn)
+ {
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public Socket createSocket()
+ {
+ return new TestSocket(exception, throwOn);
+ }
+ public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException
+ {
+ return new TestSocket(arg0, arg1, exception, throwOn);
+ }
+ public Socket createSocket(InetAddress arg0, int arg1) throws IOException
+ {
+ return new TestSocket(arg0, arg1, exception, throwOn);
+ }
+ public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException, UnknownHostException
+ {
+ return new TestSocket(arg0, arg1, arg2, arg3, exception, throwOn);
+ }
+
+ public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException
+ {
+ return new TestSocket(arg0, arg1, arg2, arg3, exception, throwOn);
+ }
+ }
+
+ static class TestSocket extends Socket
+ {
+ IOException exception;
+ int throwOn;
+
+ public TestSocket(IOException exception, int throwOn)
+ {
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public TestSocket(String host, int port, IOException exception, int throwOn) throws UnknownHostException, IOException
+ {
+ super(host, port);
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public TestSocket(InetAddress address, int port, IOException exception, int throwOn) throws IOException
+ {
+ super(address, port);
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public TestSocket(String host, int port, InetAddress localAddr, int localPort, IOException exception, int throwOn) throws IOException
+ {
+ super(host, port, localAddr, localPort);
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public TestSocket(InetAddress address, int port, InetAddress localAddr, int localPort, IOException exception, int throwOn) throws IOException
+ {
+ super(address, port, localAddr, localPort);
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public OutputStream getOutputStream() throws IOException
+ {
+ return new TestOutputStream(super.getOutputStream(), exception, throwOn);
+ }
+ public String toString()
+ {
+ return "TestSocket[" + getLocalPort() + "->" + getPort() + "]";
+ }
+ }
+
+ static class TestOutputStream extends OutputStream
+ {
+ OutputStream os;
+ IOException exception;
+ boolean closed;
+ int throwOn;
+ boolean doThrowException = true;
+ public static int counter;
+
+ public TestOutputStream(OutputStream os, IOException exception, int throwOn)
+ {
+ this.os = os;
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public void close()throws IOException
+ {
+ closed = true;
+ super.close();
+ log.info(this + " closed");
+ }
+ public void write(int b) throws IOException
+ {
+ System.out.print("b: " + b);
+ if (closed)
+ {
+ log.info("TestOutputStream closed, cannot write");
+ throw new IOException("closed");
+ }
+ if (doThrowException && ++counter == throwOn)
+ {
+ throw exception;
+ }
+ os.write(b);
+ }
+ public void write(byte b[], int off, int len) throws IOException
+ {
+ System.out.print("b: ");
+ for (int i = 0; i < len; i++)
+ {
+ System.out.print(b[i] + " ");
+ }
+ System.out.println("");
+ if (closed)
+ {
+ log.info("TestOutputStream closed, cannot write");
+ throw new IOException("closed");
+ }
+ log.info("TestOutputStream: counter = " + counter + ", throwOn = " + throwOn);
+ if (++counter == throwOn)
+ {
+ throw exception;
+ }
+ if (closed)
+ {
+ log.info("TestOutputStream closed, cannot write");
+ throw new IOException("closed");
+ }
+ try
+ {
+ log.info(this + " calling write()");
+ doThrowException = false;
+ os.write(b, off, len);
+ os.flush();
+ doThrowException = true;
+ log.info(this + " back from write()");
+ }
+ catch (IOException e)
+ {
+ log.info("exception: ", e);
+ throw e;
+ }
+ }
+ }
+}
\ No newline at end of file
15 years, 3 months
JBoss Remoting SVN: r5430 - 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: 2009-09-02 13:23:18 -0400 (Wed, 02 Sep 2009)
New Revision: 5430
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
Log:
JBREM-1146: Added generalized SocketException facility.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-09-02 17:18:25 UTC (rev 5429)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-09-02 17:23:18 UTC (rev 5430)
@@ -31,6 +31,7 @@
import java.net.InetSocketAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
+import java.rmi.MarshalException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -40,6 +41,8 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.regex.Pattern;
+
import EDU.oswego.cs.dl.util.concurrent.Semaphore;
/**
@@ -136,6 +139,9 @@
public static long serializeTime = 0;
public static long deserializeTime = 0;
+ private static final String patternString = "^.*(?:connection.*reset|connection.*closed|broken.*pipe).*$";
+ private static final Pattern RETRIABLE_ERROR_MESSAGE = Pattern.compile(patternString, Pattern.CASE_INSENSITIVE);
+
/**
* Close all sockets in a specific pool.
*/
@@ -251,6 +257,12 @@
protected int soLingerDuration = -1;
protected int trafficClass = -1;
+ /**
+ * If true, an IOException with message such as "Connection reset by peer: socket write error" will
+ * be treated like a SocketException.
+ */
+ protected boolean generalizeSocketException;
+
protected int writeTimeout = -1;
// Constructors ---------------------------------------------------------------------------------
@@ -399,6 +411,16 @@
this.writeTimeout = writeTimeout;
}
+ public boolean isGeneralizeSocketException()
+ {
+ return generalizeSocketException;
+ }
+
+ public void setGeneralizeSocketException(boolean generalizeSocketException)
+ {
+ this.generalizeSocketException = generalizeSocketException;
+ }
+
public synchronized void disconnect()
{
log.debug(this + " disconnecting ...");
@@ -776,6 +798,7 @@
for (; retryCount < numberOfCallRetries; retryCount++)
{
+ if (trace) log.trace(this + " retryCount: " + retryCount);
if (0 < tempTimeout)
{
// If a per invocation timeout has been set, the time spent retrying
@@ -905,25 +928,23 @@
sockEx = ex;
continue;
}
- catch (Exception ex)
+ catch (IOException e)
{
- log.debug(this + " got exception: " + socketWrapper, ex);
-
- try
+ if (isGeneralizeSocketException() && RETRIABLE_ERROR_MESSAGE.matcher(e.getMessage()).matches())
{
- semaphore.release();
- if (trace) log.trace(this + " released semaphore: " + semaphore.permits());
- socketWrapper.close();
+ handleRetriableException(socketWrapper, e, retryCount);
+ sockEx = new SocketException(e.getMessage());
+ continue;
}
- catch (Exception ignored)
+ else
{
+ return handleOtherException(e, semaphore, socketWrapper, oneway);
}
-
- if (oneway)
- return null;
- else
- return handleException(ex, socketWrapper);
}
+ catch (Exception ex)
+ {
+ return handleOtherException(ex, semaphore, socketWrapper, oneway);
+ }
// call worked, so no need to retry
break;
@@ -1037,6 +1058,27 @@
}
}
+ protected Object handleOtherException(Exception ex, Semaphore semaphore, SocketWrapper socketWrapper, boolean oneway)
+ throws ClassNotFoundException, InvocationFailureException
+ {
+ log.debug(this + " got exception: " + socketWrapper, ex);
+
+ try
+ {
+ semaphore.release();
+ if (trace) log.trace(this + " released semaphore: " + semaphore.permits());
+ socketWrapper.close();
+ }
+ catch (Exception ignored)
+ {
+ }
+
+ if (oneway)
+ return null;
+ else
+ return handleException(ex, socketWrapper);
+ }
+
protected void initPool()
{
synchronized (connectionPools)
15 years, 3 months
JBoss Remoting SVN: r5429 - in remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket: socketexception and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-02 13:18:25 -0400 (Wed, 02 Sep 2009)
New Revision: 5429
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception/
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java
Log:
JBREM-1146: New unit tests.
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java 2009-09-02 17:18:25 UTC (rev 5429)
@@ -0,0 +1,506 @@
+/*
+ * 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.socketexception;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.rmi.MarshalException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+import javax.net.SocketFactory;
+
+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.Remoting;
+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;
+
+
+/**
+ * Unit tests for JBREM-1146.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Sep 2, 2009
+ * </p>
+ */
+public class GeneralizeSocketExceptionTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(GeneralizeSocketExceptionTestCase.class);
+ private static String connectionResetMessage = "yada yada connection reset yada yada";
+ private static String connectionClosedMessage = "yada yada connection closed yada yada";
+ private static String brokenPipeMessage = "yada yada broken pipe yada yada";
+
+ private static boolean firstTime = true;
+
+ 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.DEBUG);
+ 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);
+ }
+
+ TestOutputStream.counter = 0;
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testConnectionResetNotGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(connectionResetMessage), 2));
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation fails.
+ try
+ {
+ client.invoke("abc");
+ }
+ catch (MarshalException e)
+ {
+ Throwable t = e.getCause();
+ assertEquals(connectionResetMessage, t.getMessage());
+ }
+ catch (Throwable e)
+ {
+ fail("Expecteded message: " + connectionResetMessage + ", got: " + e.getMessage());
+ }
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testConnectionResetGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(connectionResetMessage), 2));
+ clientConfig.put("generalizeSocketException", "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation succeeds.
+ assertEquals("abc", client.invoke("abc"));
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testConnectionClosedNotGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(connectionClosedMessage), 2));
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation fails.
+ try
+ {
+ client.invoke("abc");
+ }
+ catch (MarshalException e)
+ {
+ Throwable t = e.getCause();
+ assertEquals(connectionClosedMessage, t.getMessage());
+ }
+ catch (Throwable e)
+ {
+ fail("Expecteded message: " + connectionClosedMessage + ", got: " + e.getMessage());
+ }
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testConnectionClosedGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(connectionClosedMessage), 2));
+ clientConfig.put("generalizeSocketException", "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation succeeds.
+ assertEquals("abc", client.invoke("abc"));
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testBrokedPipedNotGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(brokenPipeMessage), 2));
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation fails.
+ try
+ {
+ client.invoke("abc");
+ }
+ catch (MarshalException e)
+ {
+ Throwable t = e.getCause();
+ assertEquals(brokenPipeMessage, t.getMessage());
+ }
+ catch (Throwable e)
+ {
+ fail("Expecteded message: " + brokenPipeMessage + ", got: " + e.getMessage());
+ }
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testBrokedPipeGeneralized() 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(Remoting.CUSTOM_SOCKET_FACTORY, new TestSocketFactory(new IOException(brokenPipeMessage), 2));
+ clientConfig.put("generalizeSocketException", "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Verify invocation succeeds.
+ assertEquals("abc", client.invoke("abc"));
+
+ 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
+ {
+ 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) {}
+ }
+
+ public static class TestSocketFactory extends SocketFactory
+ {
+ IOException exception;
+ int throwOn = -1;
+
+ public TestSocketFactory()
+ {
+ exception = new SocketException("default");
+ }
+ public TestSocketFactory(IOException exception, int throwOn)
+ {
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public Socket createSocket()
+ {
+ return new TestSocket(exception, throwOn);
+ }
+ public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException
+ {
+ return new TestSocket(arg0, arg1, exception, throwOn);
+ }
+ public Socket createSocket(InetAddress arg0, int arg1) throws IOException
+ {
+ return new TestSocket(arg0, arg1, exception, throwOn);
+ }
+ public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException, UnknownHostException
+ {
+ return new TestSocket(arg0, arg1, arg2, arg3, exception, throwOn);
+ }
+
+ public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException
+ {
+ return new TestSocket(arg0, arg1, arg2, arg3, exception, throwOn);
+ }
+ }
+
+ static class TestSocket extends Socket
+ {
+ IOException exception;
+ int throwOn;
+
+ public TestSocket(IOException exception, int throwOn)
+ {
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public TestSocket(String host, int port, IOException exception, int throwOn) throws UnknownHostException, IOException
+ {
+ super(host, port);
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public TestSocket(InetAddress address, int port, IOException exception, int throwOn) throws IOException
+ {
+ super(address, port);
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public TestSocket(String host, int port, InetAddress localAddr, int localPort, IOException exception, int throwOn) throws IOException
+ {
+ super(host, port, localAddr, localPort);
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public TestSocket(InetAddress address, int port, InetAddress localAddr, int localPort, IOException exception, int throwOn) throws IOException
+ {
+ super(address, port, localAddr, localPort);
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public OutputStream getOutputStream() throws IOException
+ {
+ return new TestOutputStream(super.getOutputStream(), exception, throwOn);
+ }
+ public String toString()
+ {
+ return "TestSocket[" + getLocalPort() + "->" + getPort() + "]";
+ }
+ }
+
+ static class TestOutputStream extends OutputStream
+ {
+ OutputStream os;
+ IOException exception;
+ boolean closed;
+ int throwOn;
+ boolean doThrowException = true;
+ public static int counter;
+
+ public TestOutputStream(OutputStream os, IOException exception, int throwOn)
+ {
+ this.os = os;
+ this.exception = exception;
+ this.throwOn = throwOn;
+ }
+ public void close()throws IOException
+ {
+ closed = true;
+ super.close();
+ log.info(this + " closed");
+ }
+ public void write(int b) throws IOException
+ {
+ System.out.print("b: " + b);
+ if (closed)
+ {
+ log.info("TestOutputStream closed, cannot write");
+ throw new IOException("closed");
+ }
+ if (doThrowException && ++counter == throwOn)
+ {
+ throw exception;
+ }
+ os.write(b);
+ }
+ public void write(byte b[], int off, int len) throws IOException
+ {
+ System.out.print("b: ");
+ for (int i = 0; i < len; i++)
+ {
+ System.out.print(b[i] + " ");
+ }
+ System.out.println("");
+ if (closed)
+ {
+ log.info("TestOutputStream closed, cannot write");
+ throw new IOException("closed");
+ }
+ log.info("TestOutputStream: counter = " + counter + ", throwOn = " + throwOn);
+ if (++counter == throwOn)
+ {
+ throw exception;
+ }
+ if (closed)
+ {
+ log.info("TestOutputStream closed, cannot write");
+ throw new IOException("closed");
+ }
+ try
+ {
+ log.info(this + " calling write()");
+ doThrowException = false;
+ os.write(b, off, len);
+ os.flush();
+ doThrowException = true;
+ log.info(this + " back from write()");
+ }
+ catch (IOException e)
+ {
+ log.info("exception: ", e);
+ throw e;
+ }
+ }
+ }
+}
\ No newline at end of file
15 years, 3 months
JBoss Remoting SVN: r5428 - 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: 2009-09-02 13:17:29 -0400 (Wed, 02 Sep 2009)
New Revision: 5428
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
Log:
JBREM-1146: Extended generalized SocketException facility with regular expression.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-09-02 01:17:16 UTC (rev 5427)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-09-02 17:17:29 UTC (rev 5428)
@@ -29,6 +29,7 @@
import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
+import java.util.regex.Pattern;
//import java.util.concurrent.Semaphore;
//import java.util.concurrent.TimeUnit;
import EDU.oswego.cs.dl.util.concurrent.Semaphore;
@@ -117,6 +118,9 @@
public static long serializeTime = 0;
public static long deserializeTime = 0;
+ private static final String patternString = "^.*(?:connection.*reset|connection.*closed|broken.*pipe).*$";
+ private static final Pattern RETRIABLE_ERROR_MESSAGE = Pattern.compile(patternString, Pattern.CASE_INSENSITIVE);
+
/**
* Close all sockets in a specific pool.
*/
@@ -220,7 +224,7 @@
protected boolean wrapInterruptedException = false;
/**
- * If true, an IOException with message "Connection reset by peer: socket write error" will
+ * If true, an IOException with message such as "Connection reset by peer: socket write error" will
* be treated like a SocketException.
*/
protected boolean generalizeSocketException;
@@ -681,7 +685,7 @@
}
catch (IOException e)
{
- if (isGeneralizeSocketException() && e.getMessage().startsWith("Connection reset"))
+ if (isGeneralizeSocketException() && RETRIABLE_ERROR_MESSAGE.matcher(e.getMessage()).matches())
{
handleSocketException(e, socketWrapper, semaphore, retryCount);
sockEx = new SocketException(e.getMessage());
15 years, 3 months
JBoss Remoting SVN: r5427 - remoting2/branches/2.2.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-01 21:17:16 -0400 (Tue, 01 Sep 2009)
New Revision: 5427
Modified:
remoting2/branches/2.2/build.xml
Log:
JBREM-1101: Added tests.servlet.contenttype.
Modified: remoting2/branches/2.2/build.xml
===================================================================
--- remoting2/branches/2.2/build.xml 2009-09-02 01:04:21 UTC (rev 5426)
+++ remoting2/branches/2.2/build.xml 2009-09-02 01:17:16 UTC (rev 5427)
@@ -1059,14 +1059,14 @@
</target>
<target name="tests.servlet.contenttype">
- <copy file="${servlet.tests.dir}/callback/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <copy file="${servlet.tests.dir}/contenttype/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="2"/>
<copy todir="${jboss.deploy.dir}">
<fileset dir="${output.lib.dir}">
<include name="servlet-invoker.war/**"/>
</fileset>
</copy>
- <copy file="${servlet.tests.dir}/callback/WEB-INF/web.xml"
+ <copy file="${servlet.tests.dir}/contenttype/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
<sleep seconds="4"/>
<junit printsummary="true" fork="yes" includeantruntime="true">
@@ -1088,7 +1088,7 @@
<delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
</target>
- <target name="tests.servlet.marshal" depends="tests.servlet.config">
+ <target name="tests.servlet.marshal">
<copy file="${servlet.tests.dir}/marshal/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="2"/>
<copy todir="${jboss.deploy.dir}">
15 years, 3 months
JBoss Remoting SVN: r5426 - in remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet: contenttype and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-01 21:04:21 -0400 (Tue, 01 Sep 2009)
New Revision: 5426
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/ServletContentTypeTestClient.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerCR.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerLF.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerOK.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/remoting-servlet-service.xml
Log:
JBREM-1101: New unit tests.
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/ServletContentTypeTestClient.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/ServletContentTypeTestClient.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/ServletContentTypeTestClient.java 2009-09-02 01:04:21 UTC (rev 5426)
@@ -0,0 +1,60 @@
+/*
+ * 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.servlet.contenttype;
+
+import org.apache.log4j.Logger;
+import org.jboss.test.remoting.transport.http.contenttype.ContentTypeTestCase;
+
+/**
+ * Unit tests for JBREM-1101.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version
+ * <p>
+ * Copyright Sep 1, 2009
+ * </p>
+ */
+public class ServletContentTypeTestClient extends ContentTypeTestCase
+{
+ protected static Logger log = Logger.getLogger(ServletContentTypeTestClient.class);
+
+ protected void setupServer(String contentType) throws Exception
+ {
+ locatorURI = "http://localhost:8080/servlet-invoker/ServerInvokerServlet";
+
+ if (CONTENT_TYPE.equals(contentType))
+ {
+ locatorURI += "/OK";
+ }
+ if (INVALID_CONTENT_TYPE_CR.equals(contentType))
+ {
+ locatorURI += "/CR";
+ }
+ else if (INVALID_CONTENT_TYPE_LF.equals(contentType))
+ {
+ locatorURI += "/LF";
+ }
+
+ log.info("setting InvokerLocator to " + locatorURI);
+ }
+}
+
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerCR.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerCR.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerCR.java 2009-09-02 01:04:21 UTC (rev 5426)
@@ -0,0 +1,64 @@
+/*
+ * 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.servlet.contenttype;
+
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+
+/**
+ * For JBREM-1101 unit tests.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright Sep 1, 2009
+ * </p>
+ */
+public class TestInvocationHandlerCR implements ServerInvocationHandler
+{
+ public static String CONTENT_TYPE = "test/testContentType";
+ public static String INVALID_CONTENT_TYPE_CR = "test/x" + '\r' + "y";
+ public static String INVALID_CONTENT_TYPE_LF = "test/x" + '\n' + "y";
+ public static String REQUEST = "testRequest";
+ public static String RESPONSE = "testResponse";
+
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ Map response = invocation.getReturnPayload();
+ if (response != null)
+ {
+ response.put("Content-Type", INVALID_CONTENT_TYPE_CR);
+ }
+ return RESPONSE;
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+}
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerLF.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerLF.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerLF.java 2009-09-02 01:04:21 UTC (rev 5426)
@@ -0,0 +1,64 @@
+/*
+ * 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.servlet.contenttype;
+
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+
+/**
+ * For JBREM-1101 unit tests.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright Sep 1, 2009
+ * </p>
+ */
+public class TestInvocationHandlerLF implements ServerInvocationHandler
+{
+ public static String CONTENT_TYPE = "test/testContentType";
+ public static String INVALID_CONTENT_TYPE_CR = "test/x" + '\r' + "y";
+ public static String INVALID_CONTENT_TYPE_LF = "test/x" + '\n' + "y";
+ public static String REQUEST = "testRequest";
+ public static String RESPONSE = "testResponse";
+
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ Map response = invocation.getReturnPayload();
+ if (response != null)
+ {
+ response.put("Content-Type", INVALID_CONTENT_TYPE_CR);
+ }
+ return RESPONSE;
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+}
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerOK.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerOK.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/TestInvocationHandlerOK.java 2009-09-02 01:04:21 UTC (rev 5426)
@@ -0,0 +1,64 @@
+/*
+ * 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.servlet.contenttype;
+
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+
+/**
+ * For JBREM-1101 unit tests.
+ *
+ * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright Sep 1, 2009
+ * </p>
+ */
+public class TestInvocationHandlerOK implements ServerInvocationHandler
+{
+ public static String CONTENT_TYPE = "test/testContentType";
+ public static String INVALID_CONTENT_TYPE_CR = "test/x" + '\r' + "y";
+ public static String INVALID_CONTENT_TYPE_LF = "test/x" + '\n' + "y";
+ public static String REQUEST = "testRequest";
+ public static String RESPONSE = "testResponse";
+
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ Map response = invocation.getReturnPayload();
+ if (response != null)
+ {
+ response.put("Content-Type", CONTENT_TYPE);
+ }
+ return RESPONSE;
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+}
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/remoting-servlet-service.xml
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/remoting-servlet-service.xml (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/contenttype/remoting-servlet-service.xml 2009-09-02 01:04:21 UTC (rev 5426)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=Connector,transport=Servlet,target=tests,version=OK"
+ display-name="Servlet transport Connector">
+
+ <attribute name="InvokerLocator">
+ servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?version=OK
+ </attribute>
+
+ <attribute name="Configuration">
+ <config>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.transport.servlet.contenttype.TestInvocationHandlerOK</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=Connector,transport=Servlet,target=tests,version=CR"
+ display-name="Servlet transport Connector">
+
+ <attribute name="InvokerLocator">
+ servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?version=CR
+ </attribute>
+
+ <attribute name="Configuration">
+ <config>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.transport.servlet.contenttype.TestInvocationHandlerCR</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=Connector,transport=Servlet,target=tests,version=LF"
+ display-name="Servlet transport Connector">
+
+ <attribute name="InvokerLocator">
+ servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?version=LF
+ </attribute>
+
+ <attribute name="Configuration">
+ <config>
+ <handlers>
+ <handler subsystem="test">org.jboss.test.remoting.transport.servlet.contenttype.TestInvocationHandlerLF</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+</server>
15 years, 3 months
JBoss Remoting SVN: r5425 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/contenttype.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-01 21:03:30 -0400 (Tue, 01 Sep 2009)
New Revision: 5425
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/contenttype/ContentTypeTestCase.java
Log:
JBREM-1101: Minor changes to implement the servlet version.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/contenttype/ContentTypeTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/contenttype/ContentTypeTestCase.java 2009-09-02 01:02:41 UTC (rev 5424)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/contenttype/ContentTypeTestCase.java 2009-09-02 01:03:30 UTC (rev 5425)
@@ -60,14 +60,14 @@
*/
public class ContentTypeTestCase extends TestCase
{
+ public static String CONTENT_TYPE = "test/testContentType";
+ public static String INVALID_CONTENT_TYPE_CR = "test/x" + '\r' + "y";
+ public static String INVALID_CONTENT_TYPE_LF = "test/x" + '\n' + "y";
+ public static String REQUEST = "testRequest";
+ public static String RESPONSE = "testResponse";
+
private static Logger log = Logger.getLogger(ContentTypeTestCase.class);
-
private static boolean firstTime = true;
- private static String CONTENT_TYPE = "test/testContentType";
- private static String INVALID_CONTENT_TYPE_CR = "test/x" + '\r' + "y";
- private static String INVALID_CONTENT_TYPE_LF = "test/x" + '\n' + "y";
- private static String REQUEST = "testRequest";
- private static String RESPONSE = "testResponse";
protected String host;
protected int port;
@@ -126,7 +126,7 @@
assertEquals(CONTENT_TYPE, contentType);
assertEquals(RESPONSE, response);
- connector.stop();
+ teardownServer();
log.info(getName() + " PASSES");
}
@@ -161,7 +161,7 @@
assertEquals(WebUtil.HTML, contentType);
assertEquals(RESPONSE, response);
- connector.stop();
+ teardownServer();
log.info(getName() + " PASSES");
}
@@ -196,7 +196,7 @@
assertEquals(WebUtil.HTML, contentType);
assertEquals(RESPONSE, response);
- connector.stop();
+ teardownServer();
log.info(getName() + " PASSES");
}
@@ -234,6 +234,15 @@
}
+ protected void teardownServer()
+ {
+ if (connector != null)
+ {
+ connector.stop();
+ }
+ }
+
+
static class TestInvocationHandler implements ServerInvocationHandler
{
String contentType;
15 years, 3 months
JBoss Remoting SVN: r5424 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/servlet.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-01 21:02:41 -0400 (Tue, 01 Sep 2009)
New Revision: 5424
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java
Log:
JBREM-1101: Checks that application supplied content-type doesn't have LF or CR.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java 2009-09-02 00:45:56 UTC (rev 5423)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java 2009-09-02 01:02:41 UTC (rev 5424)
@@ -251,7 +251,14 @@
if(invocationResponse != null)
{
- response.setContentType(requestContentType);
+ if (isInvalidContentType(requestContentType))
+ {
+ log.warn("Ignoring invalid content-type from client: " + requestContentType);
+ }
+ else
+ {
+ response.setContentType(requestContentType);
+ }
int iContentLength = getContentLength(invocationResponse);
response.setContentLength(iContentLength);
ServletOutputStream outputStream = response.getOutputStream();
@@ -477,10 +484,19 @@
{
responseContentType = (String) responseMap.get("Content-Type");
}
- if(responseContentType == null)
+
+ if (responseContentType != null)
{
- responseContentType = responseObject == null ? requestContentType : WebUtil.getContentType(responseObject);
+ if (isInvalidContentType(responseContentType))
+ {
+ log.warn("Ignoring invalid content-type from ServerInvocationHandler: " + responseContentType);
+ responseContentType = WebUtil.getContentType(responseObject);
+ }
}
+ else
+ {
+ responseContentType = WebUtil.getContentType(responseObject);
+ }
response.setContentType(responseContentType);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
Marshaller marshaller = getMarshaller();
@@ -510,6 +526,11 @@
return retval;
}
+ static private boolean isInvalidContentType(String contentType)
+ {
+ return contentType.indexOf('\n') + contentType.indexOf('\r') > -2;
+ }
+
private boolean checkForExceptionReturn(Map headers)
{
boolean flag = false;
15 years, 3 months
JBoss Remoting SVN: r5423 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-01 20:45:56 -0400 (Tue, 01 Sep 2009)
New Revision: 5423
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java
Log:
JBREM-1101: Removed log.info() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java 2009-09-02 00:37:08 UTC (rev 5422)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java 2009-09-02 00:45:56 UTC (rev 5423)
@@ -500,7 +500,6 @@
{
responseContentType = WebUtil.getContentType(responseObject);
}
- log.info("responseContentType: " + responseContentType);
response.setContentType(responseContentType);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
Marshaller marshaller = getMarshaller();
15 years, 3 months
JBoss Remoting SVN: r5422 - remoting2/branches/2.2.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-01 20:37:08 -0400 (Tue, 01 Sep 2009)
New Revision: 5422
Modified:
remoting2/branches/2.2/build.xml
Log:
JBREM-1101: Added tests.servlet.contenttype.
Modified: remoting2/branches/2.2/build.xml
===================================================================
--- remoting2/branches/2.2/build.xml 2009-09-02 00:33:01 UTC (rev 5421)
+++ remoting2/branches/2.2/build.xml 2009-09-02 00:37:08 UTC (rev 5422)
@@ -988,6 +988,7 @@
<antcall target="AS.start"/>
<antcall target="tests.servlet" inheritrefs="true"/>
<antcall target="tests.servlet.callback" inheritrefs="true"/>
+ <antcall target="tests.servlet.contenttype" inheritrefs="true"/>
<antcall target="tests.servlet.marshal" inheritrefs="true"/>
<antcall target="tests.servlet.marshal.config" inheritrefs="true"/>
<antcall target="tests.servlet.marshal.noconfig" inheritrefs="true"/>
@@ -1056,7 +1057,37 @@
<delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
<delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
</target>
-
+
+ <target name="tests.servlet.contenttype">
+ <copy file="${servlet.tests.dir}/callback/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/callback/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>
+ <sleep seconds="4"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/transport/servlet/contenttype/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
<target name="tests.servlet.marshal" depends="tests.servlet.config">
<copy file="${servlet.tests.dir}/marshal/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="2"/>
15 years, 3 months