Author: ron.sigal(a)jboss.com Date: 2013-11-02 18:50:17 -0400 (Sat, 02 Nov 2013) New Revision: 6506 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketwrapper/ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketwrapper/SocketWrapperFailureTestCase.java Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java Log: JBREM-1323: ServerThread closes socket if SocketWrapper creations fails. 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 2013-08-16 16:14:11 UTC (rev 6505) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java 2013-11-02 22:50:17 UTC (rev 6506) @@ -702,6 +702,13 @@ socketWrapper.close(); log.debug(this + " closed socketWrapper: " + desc); } + else + { + String desc = socket.toString(); + socket.close(); + log.debug(this + " closed socket: " + desc); + } + } catch (Exception ex) { Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketwrapper/SocketWrapperFailureTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketwrapper/SocketWrapperFailureTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketwrapper/SocketWrapperFailureTestCase.java 2013-11-02 22:50:17 UTC (rev 6506) @@ -0,0 +1,203 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.remoting.transport.socket.socketwrapper; + +import java.lang.reflect.Field; +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.Assert; +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.ServerInvocationHandler; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.Callback; +import org.jboss.remoting.callback.HandleCallbackException; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.socket.ServerSocketWrapper; +import org.jboss.remoting.transport.socket.ServerThread; +import org.jboss.remoting.transport.socket.SocketServerInvoker; + + +public class SocketWrapperFailureTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(SocketWrapperFailureTestCase.class); + + 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); + } + } + + + public void tearDown() + { + } + + + public void testServerSocketWrapperCreationFailure() 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("timeout", "1000"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Try to invoke. + try + { + client.invoke("abc"); + } + catch (Exception e) + { + // ok. + } + + // Test socket on server side. + Field field = SocketServerInvoker.class.getDeclaredField("threadpool"); + field.setAccessible(true); + LinkedList threadpool = (LinkedList) field.get(connector.getServerInvoker()); + Assert.assertEquals(1, threadpool.size()); + ServerThread serverThread = (ServerThread) threadpool.iterator().next(); + field = ServerThread.class.getDeclaredField("socket"); + field.setAccessible(true); + Socket socket = (Socket) field.get(serverThread); + log.info("socket: " + socket); + Assert.assertTrue(socket.isClosed()); + log.info("socket is closed"); + + 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"); + config.put(SocketServerInvoker.SERVER_SOCKET_CLASS_FLAG, TestServerSocketWrapper.class.getName()); + 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 public class TestServerSocketWrapper extends ServerSocketWrapper + { + public TestServerSocketWrapper(Socket socket) throws Exception + { + super(socket); + throw new Exception("test"); + } + + public TestServerSocketWrapper(Socket socket, Map metadata, Integer timeout) throws Exception + { + super(socket, metadata, timeout); + throw new Exception("test"); + } + } +} \ No newline at end of file Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketwrapper/SocketWrapperFailureTestCase.java ___________________________________________________________________ Added: svn:mime-type + text/plain