December 2008 - jboss-remoting-commits

JBoss Remoting SVN: r4771 - remoting2/branches/2.x/src/main/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-12-29 21:33:54 -0500 (Mon, 29 Dec 2008) New Revision: 4771 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Remoting.java Log: JBREM-1073: Added CHANGE_INVALID_STATE_TO_CANNOT_CONNECT. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Remoting.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/Remoting.java 2008-12-30 02:09:29 UTC (rev 4770) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/Remoting.java 2008-12-30 02:33:54 UTC (rev 4771) @@ -94,4 +94,10 @@ * classloading facility. */ public static final String REMOTE_CLASS_LOADERS = "remoteClassLoaders"; + + /** + * A flag indicating whether org.jboss.remoting.MicroRemoteClientInvoker should translate an + * org.jboss.remoting.ServerInvoker.InvalidStateException to an org.jboss.remoting.CannotConnectException. + */ + public static final String CHANGE_INVALID_STATE_TO_CANNOT_CONNECT = "changeInvalidStateToCannotConnect"; }

16 years

1
0
0 / 0

JBoss Remoting SVN: r4770 - remoting2/branches/2.x/src/main/org/jboss/remoting/marshal.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-12-29 21:09:29 -0500 (Mon, 29 Dec 2008) New Revision: 4770 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/MarshalFactory.java Log: JBREM-1072: Made static maps synchronized collections. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/MarshalFactory.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/MarshalFactory.java 2008-12-29 21:43:30 UTC (rev 4769) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/MarshalFactory.java 2008-12-30 02:09:29 UTC (rev 4770) @@ -31,6 +31,7 @@ import org.jboss.remoting.marshal.serializable.SerializableMarshaller; import org.jboss.remoting.marshal.serializable.SerializableUnMarshaller; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -46,10 +47,10 @@ */ public class MarshalFactory { - private static Map marshallers = new HashMap(); - private static Map unmarshallers = new HashMap(); - private static Map classMarshallers = new HashMap(); - private static Map classUnmarshallers = new HashMap(); + private static Map marshallers = Collections.synchronizedMap(new HashMap()); + private static Map unmarshallers = Collections.synchronizedMap(new HashMap()); + private static Map classMarshallers = Collections.synchronizedMap(new HashMap()); + private static Map classUnmarshallers = Collections.synchronizedMap(new HashMap()); protected final static Logger log = Logger.getLogger(MarshalFactory.class);

16 years

1
0
0 / 0

JBoss Remoting SVN: r4769 - 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: 2008-12-29 16:43:30 -0500 (Mon, 29 Dec 2008) New Revision: 4769 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/shutdown/ShutdownExceptionTestCase.java Log: JBREM-1073: New unit test. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/shutdown/ShutdownExceptionTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/shutdown/ShutdownExceptionTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/shutdown/ShutdownExceptionTestCase.java 2008-12-29 21:43:30 UTC (rev 4769) @@ -0,0 +1,238 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.remoting.shutdown; + +import java.net.InetAddress; +import java.util.HashMap; +import java.util.Map; + +import javax.management.MBeanServer; + +import junit.framework.TestCase; + +import org.apache.log4j.ConsoleAppender; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.apache.log4j.PatternLayout; +import org.jboss.logging.XLevel; +import org.jboss.remoting.CannotConnectException; +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 test for JBREM-1073. + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version + * <p> + * Copyright Dec 26, 2008 + * </p> + */ +public class ShutdownExceptionTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(ShutdownExceptionTestCase.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(XLevel.INFO); + Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); + String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; + PatternLayout layout = new PatternLayout(pattern); + ConsoleAppender consoleAppender = new ConsoleAppender(layout); + Logger.getRootLogger().addAppender(consoleAppender); + } + } + + + public void tearDown() + { + } + + + public void testDefaultBehavior() throws Throwable + { + log.info("entering " + getName()); + HashMap config = new HashMap(); + doTestDefaultBehavior(config); + log.info(getName() + " PASSES"); + } + + + public void testChangeInvalidStateToCannotConnectFalse() throws Throwable + { + System.out.println(""); + log.info("entering " + getName()); + HashMap config = new HashMap(); + config.put(Remoting.CHANGE_INVALID_STATE_TO_CANNOT_CONNECT, "false"); + doTestDefaultBehavior(config); + log.info(getName() + " PASSES"); + } + + + public void testChangeInvalidStateToCannotConnectTrue() throws Throwable + { + System.out.println(""); + log.info("entering " + getName()); + + try + { + HashMap config = new HashMap(); + config.put(Remoting.CHANGE_INVALID_STATE_TO_CANNOT_CONNECT, "true"); + doTest(config); + fail("No Exception: expected CannotConnectException"); + } + catch (CannotConnectException e) + { + log.info("got expected CannotConnectException"); + } + catch (Throwable t) + { + log.error("Expected CannotConnectException", t); + fail("Expected CannotConnectException: got " + t); + } + + log.info(getName() + " PASSES"); + } + + + protected void doTestDefaultBehavior(Map config) throws Throwable + { + try + { + doTest(config); + fail("No Exception: expected InvalidStateException"); + } + catch (ServerInvoker.InvalidStateException e) + { + log.info("got expected InvalidStateException"); + } + catch (Throwable t) + { + log.error("Expected InvalidStateException", t); + fail("Expected InvalidStateException: got " + t); + } + } + + + protected void doTest(Map config) throws Throwable + { + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(config); + Client client = new Client(clientLocator, config); + client.connect(); + log.info("client is connected"); + + // Test connection. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + // Give ServerThread time to start to read version (socket and bisocket transports). + Thread.sleep(1000); + + // Shut down server. + shutdownServer(); + + // Try invocation. + client.invoke("xyz"); + + client.disconnect(); + } + + + 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) {} + } +} \ No newline at end of file

16 years

1
0
0 / 0

JBoss Remoting SVN: r4768 - remoting2/branches/2.2/src/main/org/jboss/remoting/marshal.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-12-29 16:42:21 -0500 (Mon, 29 Dec 2008) New Revision: 4768 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshalFactory.java Log: JBREM-1072: Made static maps synchronized collections. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshalFactory.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshalFactory.java 2008-12-29 21:39:26 UTC (rev 4767) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshalFactory.java 2008-12-29 21:42:21 UTC (rev 4768) @@ -31,6 +31,7 @@ import org.jboss.remoting.marshal.serializable.SerializableMarshaller; import org.jboss.remoting.marshal.serializable.SerializableUnMarshaller; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -46,10 +47,10 @@ */ public class MarshalFactory { - private static Map marshallers = new HashMap(); - private static Map unmarshallers = new HashMap(); - private static Map classMarshallers = new HashMap(); - private static Map classUnmarshallers = new HashMap(); + private static Map marshallers = Collections.synchronizedMap(new HashMap()); + private static Map unmarshallers = Collections.synchronizedMap(new HashMap()); + private static Map classMarshallers = Collections.synchronizedMap(new HashMap()); + private static Map classUnmarshallers = Collections.synchronizedMap(new HashMap()); protected final static Logger log = Logger.getLogger(MarshalFactory.class);

16 years

1
0
0 / 0

JBoss Remoting SVN: r4767 - remoting2/branches/2.2/src/main/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-12-29 16:39:26 -0500 (Mon, 29 Dec 2008) New Revision: 4767 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Remoting.java Log: JBREM-1073: Added CHANGE_INVALID_STATE_TO_CANNOT_CONNECT. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Remoting.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/Remoting.java 2008-12-29 21:39:01 UTC (rev 4766) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/Remoting.java 2008-12-29 21:39:26 UTC (rev 4767) @@ -70,4 +70,10 @@ */ public static final String CLASSLOADING_PARENT_FIRST_DELEGATION = "classloadingParentFirstDelegation"; public static final String CLASSLOADING_PARENT_FIRST_DELEGATION_PROP = "org.jboss.remoting.classloadingParentFirstDelegation"; + + /** + * A flag indicating whether org.jboss.remoting.MicroRemoteClientInvoker should translate an + * org.jboss.remoting.ServerInvoker.InvalidStateException to an org.jboss.remoting.CannotConnectException. + */ + public static final String CHANGE_INVALID_STATE_TO_CANNOT_CONNECT = "changeInvalidStateToCannotConnect"; }

16 years

1
0
0 / 0

JBoss Remoting SVN: r4766 - remoting2/branches/2.2/src/main/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-12-29 16:39:01 -0500 (Mon, 29 Dec 2008) New Revision: 4766 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java Log: JBREM-1073: Added facility to rethrow an InvalidStateException as a CannotConnectException. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2008-12-28 03:20:03 UTC (rev 4765) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2008-12-29 21:39:01 UTC (rev 4766) @@ -42,6 +42,7 @@ private LeasePinger leasePinger = null; private String invokerSessionID = new GUID().toString(); private boolean parentFirstClassLoading = true; + private boolean changeInvalidStateToCannotConnect = false; public MicroRemoteClientInvoker(InvokerLocator locator) { @@ -176,16 +177,26 @@ System.arraycopy(serverStackTrace, 0, completeStackTrace, 0, serverStackTrace.length); System.arraycopy(clientStackTrace, 0, completeStackTrace, serverStackTrace.length, clientStackTrace.length); + Throwable responseException = null; + if (e instanceof ServerInvoker.InvalidStateException && changeInvalidStateToCannotConnect) + { + responseException = new CannotConnectException(e.getMessage(), e.getCause()); + } + else + { + responseException = e; + } + if (e.getCause() != null) { - e.getCause().setStackTrace(completeStackTrace); + responseException.getCause().setStackTrace(completeStackTrace); } else { - e.setStackTrace(completeStackTrace); + responseException.setStackTrace(completeStackTrace); } - throw e; + throw responseException; } if (trace) { log.trace(this + " received InvocationResponse so going to return response's return value of " + returnValue);} @@ -498,6 +509,13 @@ parentFirst = Boolean.valueOf(sflag).booleanValue(); } parentFirstClassLoading = parentFirst; + + flag = configuration.get(Remoting.CHANGE_INVALID_STATE_TO_CANNOT_CONNECT); + if (flag != null) + { + String sflag = flag.toString(); + changeInvalidStateToCannotConnect = Boolean.valueOf(sflag).booleanValue(); + } } /**

16 years

1
0
0 / 0

JBoss Remoting SVN: r4765 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-12-27 22:20:03 -0500 (Sat, 27 Dec 2008) New Revision: 4765 Removed: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java Log: JBREM-1055, JBREM-1070: Renamed ConnectionValidatorTest to ConnectionValidatorTestCase and moved to org.jboss.test.remoting.connection. Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java 2008-12-28 03:19:14 UTC (rev 4764) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java 2008-12-28 03:20:03 UTC (rev 4765) @@ -1,78 +0,0 @@ -package org.jboss.test.remoting; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.Map; - -import junit.framework.TestCase; - -import org.jboss.remoting.Client; -import org.jboss.remoting.ConnectionFailedException; -import org.jboss.remoting.ConnectionValidator; -import org.jboss.remoting.InvokerLocator; -import org.jboss.remoting.MicroRemoteClientInvoker; -import org.jboss.remoting.marshal.Marshaller; -import org.jboss.remoting.marshal.UnMarshaller; -import org.jboss.remoting.transport.ClientInvoker; - -public class ConnectionValidatorTest extends TestCase -{ - - public void testShouldDisallowDirectRun() - { - ConnectionValidator cv = new ConnectionValidator(new Client() { - public Map getConfiguration() - { - return null; - } - - public ClientInvoker getInvoker() - { - try - { - return new MicroRemoteClientInvoker( - new InvokerLocator("http://dummy:65535/dummy/")) { - - public String getSessionId() - { - return "dummyId"; - } - - protected String getDefaultDataType() - { - throw new UnsupportedOperationException(); - } - - protected void handleConnect() throws ConnectionFailedException - { - throw new UnsupportedOperationException(); - } - - protected void handleDisconnect() - { - throw new UnsupportedOperationException(); - } - - protected Object transport(String sessionId, Object invocation, Map metadata, Marshaller marshaller, - UnMarshaller unmarshaller) throws IOException, ConnectionFailedException, ClassNotFoundException - { - throw new UnsupportedOperationException(); - } - }; - } - catch (MalformedURLException e) - { - throw new RuntimeException(e); - } - } - }); - - try - { - cv.run(); - fail("Should throw IllegalStateException"); - } catch (IllegalStateException e) { - // Expected - } - } -}

16 years

1
0
0 / 0

JBoss Remoting SVN: r4764 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-12-27 22:19:14 -0500 (Sat, 27 Dec 2008) New Revision: 4764 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java Log: JBREM-1055, JBREM-1070: Renamed ConnectionValidatorTest to ConnectionValidatorTestCase and moved to org.jboss.test.remoting.connection. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java 2008-12-28 03:19:14 UTC (rev 4764) @@ -0,0 +1,78 @@ +package org.jboss.test.remoting.connection; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.Map; + +import junit.framework.TestCase; + +import org.jboss.remoting.Client; +import org.jboss.remoting.ConnectionFailedException; +import org.jboss.remoting.ConnectionValidator; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.MicroRemoteClientInvoker; +import org.jboss.remoting.marshal.Marshaller; +import org.jboss.remoting.marshal.UnMarshaller; +import org.jboss.remoting.transport.ClientInvoker; + +public class ConnectionValidatorTestCase extends TestCase +{ + + public void testShouldDisallowDirectRun() + { + ConnectionValidator cv = new ConnectionValidator(new Client() { + public Map getConfiguration() + { + return null; + } + + public ClientInvoker getInvoker() + { + try + { + return new MicroRemoteClientInvoker( + new InvokerLocator("http://dummy:65535/dummy/")) { + + public String getSessionId() + { + return "dummyId"; + } + + protected String getDefaultDataType() + { + throw new UnsupportedOperationException(); + } + + protected void handleConnect() throws ConnectionFailedException + { + throw new UnsupportedOperationException(); + } + + protected void handleDisconnect() + { + throw new UnsupportedOperationException(); + } + + protected Object transport(String sessionId, Object invocation, Map metadata, Marshaller marshaller, + UnMarshaller unmarshaller) throws IOException, ConnectionFailedException, ClassNotFoundException + { + throw new UnsupportedOperationException(); + } + }; + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + } + }); + + try + { + cv.run(); + fail("Should throw IllegalStateException"); + } catch (IllegalStateException e) { + // Expected + } + } +}

16 years

1
0
0 / 0

JBoss Remoting SVN: r4763 - remoting3/trunk/version/src/main/java/org/jboss/remoting/version.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2008-12-18 22:09:02 -0500 (Thu, 18 Dec 2008) New Revision: 4763 Modified: remoting3/trunk/version/src/main/java/org/jboss/remoting/version/Version.java Log: Next is CR1 Modified: remoting3/trunk/version/src/main/java/org/jboss/remoting/version/Version.java =================================================================== --- remoting3/trunk/version/src/main/java/org/jboss/remoting/version/Version.java 2008-12-19 03:08:15 UTC (rev 4762) +++ remoting3/trunk/version/src/main/java/org/jboss/remoting/version/Version.java 2008-12-19 03:09:02 UTC (rev 4763) @@ -11,7 +11,7 @@ /** * The version. */ - public static final String VERSION = "3.0.0.Beta2"; + public static final String VERSION = "3.0.0.CR1"; /** * Print the version to {@code System.out}.

16 years

1
0
0 / 0

JBoss Remoting SVN: r4762 - remoting3/tags.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2008-12-18 22:08:15 -0500 (Thu, 18 Dec 2008) New Revision: 4762 Added: remoting3/tags/3.0.0.Beta2/ Log: Release 3.0.0.Beta2 Copied: remoting3/tags/3.0.0.Beta2 (from rev 4761, remoting3/trunk)

16 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits December 2008