January 2011 - jboss-remoting-commits

JBoss Remoting SVN: r6212 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity.

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

Author: ron.sigal(a)jboss.com Date: 2011-01-20 16:57:11 -0500 (Thu, 20 Jan 2011) New Revision: 6212 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java Log: JBREM-1144: Put 1 second sleep before restarting server. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2011-01-20 05:07:39 UTC (rev 6211) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2011-01-20 21:57:11 UTC (rev 6212) @@ -146,9 +146,10 @@ // Verify listener is notified if server bounces. shutdownServer(); log.info("SHUT DOWN SERVER"); + Thread.sleep(1000); setupServer(false); log.info("SET UP NEW SERVER"); - Thread.sleep(10000); + Thread.sleep(9000); log.info(this + " listener.connectionFailed: " + listener.connectionFailed); assertTrue(listener.connectionFailed); @@ -205,9 +206,10 @@ // Verify listener is notified if server bounces. shutdownServer(); log.info("SHUT DOWN SERVER"); + Thread.sleep(1000); setupServer(true); log.info("SET UP NEW SERVER"); - Thread.sleep(15000); + Thread.sleep(14000); log.info(this + " listener.connectionFailed: " + listener.connectionFailed); assertTrue(listener.connectionFailed);

13 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r6211 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http.

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

Author: ron.sigal(a)jboss.com Date: 2011-01-20 00:07:39 -0500 (Thu, 20 Jan 2011) New Revision: 6211 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java Log: JBREM-1267: Added disconnectAfterUse option. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2011-01-20 04:59:22 UTC (rev 6210) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2011-01-20 05:07:39 UTC (rev 6211) @@ -105,11 +105,17 @@ */ public static final String IGNORE_ERROR_RESPONSE_MESSAGE = "ignoreErrorResponseMessage"; + /** + * Specifies whether the HttpURLConnection should be disconnected after the invocation. + */ + public static final String DISCONNECT_AFTER_USE = "disconnectAfterUse"; + protected static final Logger log = Logger.getLogger(HTTPClientInvoker.class); protected boolean unmarshalNullStream = true; protected boolean useRemotingContentType = false; protected boolean ignoreErrorResponseMessage = false; + protected boolean disconnectAfterUse = false; private Object timeoutThreadPoolLock = new Object(); private ThreadPool timeoutThreadPool; @@ -149,66 +155,76 @@ final HttpURLConnection conn = createURLConnection(validatedUrl, metadata); - int simulatedTimeout = getSimulatedTimeout(configuration, metadata, conn); - - if (simulatedTimeout <= 0) + try { - return useHttpURLConnection(conn, invocation, metadata, marshaller, unmarshaller); - } - else - { - if (log.isTraceEnabled()) log.trace("using simulated timeout: " + simulatedTimeout); - class Holder {public Object value;} - final Holder resultHolder = new Holder(); - final Map finalMetadata = metadata; - - Runnable r = new Runnable() + int simulatedTimeout = getSimulatedTimeout(configuration, metadata, conn); + + if (simulatedTimeout <= 0) { - public void run() + return useHttpURLConnection(conn, invocation, metadata, marshaller, unmarshaller); + } + else + { + if (log.isTraceEnabled()) log.trace("using simulated timeout: " + simulatedTimeout); + class Holder {public Object value;} + final Holder resultHolder = new Holder(); + final Map finalMetadata = metadata; + + Runnable r = new Runnable() { - try + public void run() { - resultHolder.value = useHttpURLConnection(conn, invocation, finalMetadata, marshaller, unmarshaller); - if (log.isTraceEnabled()) log.trace("result: " + resultHolder.value); + try + { + resultHolder.value = useHttpURLConnection(conn, invocation, finalMetadata, marshaller, unmarshaller); + if (log.isTraceEnabled()) log.trace("result: " + resultHolder.value); + } + catch (Exception e) + { + resultHolder.value = e; + if (log.isTraceEnabled()) log.trace("exception: " + e); + } } - catch (Exception e) - { - resultHolder.value = e; - if (log.isTraceEnabled()) log.trace("exception: " + e); - } + }; + + // BasicThreadPool timeout mechanism depends on the interrupted status of + // the running thread. + Thread.interrupted(); + + ThreadPool pool = getTimeoutThreadPool(); + WaitingTaskWrapper wrapper = new WaitingTaskWrapper(r, simulatedTimeout); + if (log.isTraceEnabled()) log.trace("starting task in thread pool"); + pool.runTaskWrapper(wrapper); + if (log.isTraceEnabled()) log.trace("task finished in thread pool"); + + Object result = resultHolder.value; + if (result == null) + { + if (log.isDebugEnabled()) log.debug("invocation timed out"); + Exception cause = new SocketTimeoutException("timed out"); + throw new CannotConnectException("Can not connect http client invoker.", cause); } - }; - - // BasicThreadPool timeout mechanism depends on the interrupted status of - // the running thread. - Thread.interrupted(); - - ThreadPool pool = getTimeoutThreadPool(); - WaitingTaskWrapper wrapper = new WaitingTaskWrapper(r, simulatedTimeout); - if (log.isTraceEnabled()) log.trace("starting task in thread pool"); - pool.runTaskWrapper(wrapper); - if (log.isTraceEnabled()) log.trace("task finished in thread pool"); - - Object result = resultHolder.value; - if (result == null) - { - if (log.isDebugEnabled()) log.debug("invocation timed out"); - Exception cause = new SocketTimeoutException("timed out"); - throw new CannotConnectException("Can not connect http client invoker.", cause); + else if (result instanceof IOException) + { + throw (IOException) result; + } + else if (result instanceof RuntimeException) + { + throw (RuntimeException) result; + } + else + { + if (log.isTraceEnabled()) log.trace("returning result: " + result); + return result; + } } - else if (result instanceof IOException) + } + finally + { + if (disconnectAfterUse) { - throw (IOException) result; + conn.disconnect(); } - else if (result instanceof RuntimeException) - { - throw (RuntimeException) result; - } - else - { - if (log.isTraceEnabled()) log.trace("returning result: " + result); - return result; - } } } @@ -984,6 +1000,21 @@ val + " to a boolean value."); } } + val = configuration.get(DISCONNECT_AFTER_USE); + if (val != null) + { + try + { + disconnectAfterUse = Boolean.valueOf((String)val).booleanValue(); + log.debug(this + " setting disconnectAfterUse to " + disconnectAfterUse); + } + catch (Exception e) + { + log.warn(this + " could not convert " + + DISCONNECT_AFTER_USE + " value of " + + val + " to a boolean value."); + } + } } /**

13 years, 11 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-01-19 23:59:22 -0500 (Wed, 19 Jan 2011) New Revision: 6210 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java Log: JBREM-1267: Added disconnectAfterUse option. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2011-01-20 04:27:54 UTC (rev 6209) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2011-01-20 04:59:22 UTC (rev 6210) @@ -116,6 +116,11 @@ */ public static final String IGNORE_ERROR_RESPONSE_MESSAGE = "ignoreErrorResponseMessage"; + /** + * Specifies whether the HttpURLConnection should be disconnected after the invocation. + */ + public static final String DISCONNECT_AFTER_USE = "disconnectAfterUse"; + protected static final Logger log = Logger.getLogger(HTTPClientInvoker.class); protected boolean noThrowOnError; @@ -123,6 +128,7 @@ protected boolean unmarshalNullStream = true; protected boolean useRemotingContentType = false; protected boolean ignoreErrorResponseMessage = false; + protected boolean disconnectAfterUse = false; private Object timeoutThreadPoolLock = new Object(); private ThreadPool timeoutThreadPool; @@ -162,66 +168,74 @@ final HttpURLConnection conn = createURLConnection(validatedUrl, metadata); - int simulatedTimeout = getSimulatedTimeout(configuration, metadata, conn); - - if (simulatedTimeout <= 0) - { - return makeInvocation(conn, validatedUrl, invocation, metadata, marshaller, unmarshaller, true); - } - else - { - if (log.isTraceEnabled()) log.trace("using simulated timeout: " + simulatedTimeout); - class Holder {public Object value;} - final Holder resultHolder = new Holder(); - final Map finalMetadata = metadata; - - Runnable r = new Runnable() + try { + int simulatedTimeout = getSimulatedTimeout(configuration, metadata, conn); + + if (simulatedTimeout <= 0) { - public void run() + return makeInvocation(conn, validatedUrl, invocation, metadata, marshaller, unmarshaller, true); + } + else + { + if (log.isTraceEnabled()) log.trace("using simulated timeout: " + simulatedTimeout); + class Holder {public Object value;} + final Holder resultHolder = new Holder(); + final Map finalMetadata = metadata; + + Runnable r = new Runnable() { - try + public void run() { - resultHolder.value = useHttpURLConnection(conn, invocation, finalMetadata, marshaller, unmarshaller); - if (log.isTraceEnabled()) log.trace("result: " + resultHolder.value); + try + { + resultHolder.value = useHttpURLConnection(conn, invocation, finalMetadata, marshaller, unmarshaller); + if (log.isTraceEnabled()) log.trace("result: " + resultHolder.value); + } + catch (Exception e) + { + resultHolder.value = e; + if (log.isTraceEnabled()) log.trace("exception: " + e); + } } - catch (Exception e) - { - resultHolder.value = e; - if (log.isTraceEnabled()) log.trace("exception: " + e); - } + }; + + // BasicThreadPool timeout mechanism depends on the interrupted status of + // the running thread. + Thread.interrupted(); + + ThreadPool pool = getTimeoutThreadPool(); + WaitingTaskWrapper wrapper = new WaitingTaskWrapper(r, simulatedTimeout); + if (log.isTraceEnabled()) log.trace("starting task in thread pool"); + pool.runTaskWrapper(wrapper); + if (log.isTraceEnabled()) log.trace("task finished in thread pool"); + + Object result = resultHolder.value; + if (result == null) + { + if (log.isDebugEnabled()) log.debug("invocation timed out"); + Exception cause = new SocketTimeoutException("timed out"); + throw new CannotConnectException("Can not connect http client invoker.", cause); } - }; - - // BasicThreadPool timeout mechanism depends on the interrupted status of - // the running thread. - Thread.interrupted(); - - ThreadPool pool = getTimeoutThreadPool(); - WaitingTaskWrapper wrapper = new WaitingTaskWrapper(r, simulatedTimeout); - if (log.isTraceEnabled()) log.trace("starting task in thread pool"); - pool.runTaskWrapper(wrapper); - if (log.isTraceEnabled()) log.trace("task finished in thread pool"); - - Object result = resultHolder.value; - if (result == null) - { - if (log.isDebugEnabled()) log.debug("invocation timed out"); - Exception cause = new SocketTimeoutException("timed out"); - throw new CannotConnectException("Can not connect http client invoker.", cause); + else if (result instanceof IOException) + { + throw (IOException) result; + } + else if (result instanceof RuntimeException) + { + throw (RuntimeException) result; + } + else + { + if (log.isTraceEnabled()) log.trace("returning result: " + result); + return result; + } } - else if (result instanceof IOException) + } + finally { + if (disconnectAfterUse) { - throw (IOException) result; + conn.disconnect(); } - else if (result instanceof RuntimeException) - { - throw (RuntimeException) result; - } - else - { - if (log.isTraceEnabled()) log.trace("returning result: " + result); - return result; - } } } @@ -1100,6 +1114,22 @@ val + " to a boolean value."); } } + + val = configuration.get(DISCONNECT_AFTER_USE); + if (val != null) + { + try + { + disconnectAfterUse = Boolean.valueOf((String)val).booleanValue(); + log.debug(this + " setting disconnectAfterUse to " + disconnectAfterUse); + } + catch (Exception e) + { + log.warn(this + " could not convert " + + DISCONNECT_AFTER_USE + " value of " + + val + " to a boolean value."); + } + } } /**

13 years, 11 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-01-19 22:29:47 -0500 (Wed, 19 Jan 2011) New Revision: 6208 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java Log: Touched Version to get hudson tests to run. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2011-01-20 02:41:42 UTC (rev 6207) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2011-01-20 03:29:47 UTC (rev 6208) @@ -36,7 +36,7 @@ public static final byte VERSION_2 = 2; public static final byte VERSION_2_2 = 22; - public static final String VERSION = "2.2.3.SP4"; + public static final String VERSION = "2.2.3.SP4"; private static final byte byteVersion = VERSION_2_2; private static byte defaultByteVersion = byteVersion; private static boolean performVersioning = true;

13 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r6205 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity.

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

Author: ron.sigal(a)jboss.com Date: 2011-01-17 23:12:20 -0500 (Mon, 17 Jan 2011) New Revision: 6205 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java Log: JBREM-1144: Reset log level to TRACE. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2011-01-12 01:07:04 UTC (rev 6204) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2011-01-18 04:12:20 UTC (rev 6205) @@ -93,7 +93,7 @@ ps = new PrintStream(baosErr); setErr(ps); - Logger.getLogger("org.jboss.remoting").setLevel(XLevel.DEBUG); + Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE); Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; PatternLayout layout = new PatternLayout(pattern); @@ -154,10 +154,13 @@ setOut(originalOutPrintStream); String sOut = new String(baosOut.toByteArray()); - System.out.println(sOut); setErr(originalErrPrintStream); String sErr = new String(baosErr.toByteArray()); - System.out.println(sErr); + if (!(sOut.indexOf("detected new serverId:") > -1 || sErr.indexOf("detected new serverId:") > -1)) + { + System.out.println(sOut); + System.out.println(sErr); + } assertTrue(sOut.indexOf("detected new serverId:") > -1 || sErr.indexOf("detected new serverId:") > -1); client.disconnect(); @@ -210,10 +213,13 @@ setOut(originalOutPrintStream); String sOut = new String(baosOut.toByteArray()); -// System.out.println(sOut); setErr(originalErrPrintStream); String sErr = new String(baosErr.toByteArray()); -// System.out.println(sErr); + if (!(sOut.indexOf("detected new serverId:") > -1 || sErr.indexOf("detected new serverId:") > -1)) + { + System.out.println(sOut); + System.out.println(sErr); + } assertTrue(sOut.indexOf("detected new serverId:") > -1 || sErr.indexOf("detected new serverId:") > -1); client.disconnect();

13 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r6204 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity.

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

Author: ron.sigal(a)jboss.com Date: 2011-01-11 20:07:04 -0500 (Tue, 11 Jan 2011) New Revision: 6204 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java Log: JBREM-1144: Set log level to DEBUG. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2011-01-11 17:49:23 UTC (rev 6203) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2011-01-12 01:07:04 UTC (rev 6204) @@ -93,7 +93,7 @@ ps = new PrintStream(baosErr); setErr(ps); - Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE); + 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);

13 years, 11 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-01-11 12:49:23 -0500 (Tue, 11 Jan 2011) New Revision: 6203 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java Log: Vacuous change to run tests in hudson. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2011-01-10 18:19:02 UTC (rev 6202) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2011-01-11 17:49:23 UTC (rev 6203) @@ -27,7 +27,7 @@ //import org.jboss.logging.Logger; /** - * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a> + * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a> */ public class Version {

13 years, 11 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-01-10 13:19:02 -0500 (Mon, 10 Jan 2011) New Revision: 6202 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java Log: JBREM-1264: Updated version to 2.2.3.SP4. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2011-01-10 18:13:38 UTC (rev 6201) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2011-01-10 18:19:02 UTC (rev 6202) @@ -36,7 +36,7 @@ public static final byte VERSION_2 = 2; public static final byte VERSION_2_2 = 22; - public static final String VERSION = "2.2.3.SP3"; + public static final String VERSION = "2.2.3.SP4"; private static final byte byteVersion = VERSION_2_2; private static byte defaultByteVersion = byteVersion; private static boolean performVersioning = true;

13 years, 11 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2011-01-10 13:13:38 -0500 (Mon, 10 Jan 2011) New Revision: 6201 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java Log: Vacuous change to start hudson run. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2010-12-28 18:41:16 UTC (rev 6200) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2011-01-10 18:13:38 UTC (rev 6201) @@ -31,7 +31,7 @@ import org.jboss.remoting.util.SecurityUtility; /** - * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a> + * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a> */ public class Version {

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits January 2011