November 2013 - jboss-remoting-commits

JBoss Remoting SVN: r6512 - in remoting2/branches/2.x/docs: userguide/en and 1 other directory.

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

Author: ron.sigal(a)jboss.com Date: 2013-11-09 20:05:34 -0500 (Sat, 09 Nov 2013) New Revision: 6512 Modified: remoting2/branches/2.x/docs/guide/en/chap1.xml remoting2/branches/2.x/docs/guide/en/chap17.xml remoting2/branches/2.x/docs/guide/en/master.xml remoting2/branches/2.x/docs/userguide/en/master.xml Log: JBREM-1325: Updating docs for 2.5.4.SP5. Modified: remoting2/branches/2.x/docs/guide/en/chap1.xml =================================================================== --- remoting2/branches/2.x/docs/guide/en/chap1.xml 2013-11-04 15:57:44 UTC (rev 6511) +++ remoting2/branches/2.x/docs/guide/en/chap1.xml 2013-11-10 01:05:34 UTC (rev 6512) @@ -189,6 +189,21 @@ support jdk 1.4.</para> <section> + <title>Release 2.5.4.SP5</title> + <itemizedlist> + <listitem> + <para>A new configuration parameter, "idempotent", which, when set to "false", + prevents the retransmission of an invocation once it has been written to + the network, even if "numberOfCallRetries" is set to a value greater + than 1</para> + </listitem> + <listitem> + <para>Several bug fixes</para> + </listitem> + </itemizedlist> + </section> + + <section> <title>Release 2.5.4.SP4</title> <itemizedlist> <listitem> Modified: remoting2/branches/2.x/docs/guide/en/chap17.xml =================================================================== --- remoting2/branches/2.x/docs/guide/en/chap17.xml 2013-11-04 15:57:44 UTC (rev 6511) +++ remoting2/branches/2.x/docs/guide/en/chap17.xml 2013-11-10 01:05:34 UTC (rev 6512) @@ -70,6 +70,20 @@ <section> <title>Version 2.5</title> + <bridgehead>Release Notes - JBoss Remoting - Version 2.5.4.SP5 (Flounder)</bridgehead> + + <para><emphasis role="bold">Bug</emphasis></para> + <para>* [JBREM-1307] - TimedOutputStream OutputTimerTask call to close on SSL OutputStream blocks</para> + <para>* [JBREM-1318] - Zero is a valid value so SoLinger</para> + <para>* [JBREM-1323] - Socket not closed if ServerThread.createServerSocketWrapper() throws exception</para> + + <para><emphasis role="bold">Enhancement</emphasis></para> + <para>* [JBREM-1316] - MicroSocketClientInvoker can could lead to a remote ejb being sent data twice to the same server</para> + + <para><emphasis role="bold">Release</emphasis></para> + + <para>* [JBREM-1325] - Release 2.5.4.SP5</para> + <bridgehead>Release Notes - JBoss Remoting - Version 2.5.4.SP4 (Flounder)</bridgehead> <para><emphasis role="bold">Bug</emphasis></para> Modified: remoting2/branches/2.x/docs/guide/en/master.xml =================================================================== --- remoting2/branches/2.x/docs/guide/en/master.xml 2013-11-04 15:57:44 UTC (rev 6511) +++ remoting2/branches/2.x/docs/guide/en/master.xml 2013-11-10 01:05:34 UTC (rev 6512) @@ -24,9 +24,9 @@ <bookinfo> <title>JBoss Remoting Guide</title> - <subtitle>JBoss Remoting version 2.5.4.SP4</subtitle> + <subtitle>JBoss Remoting version 2.5.4.SP5</subtitle> - <releaseinfo>July 25, 2012</releaseinfo> + <releaseinfo>November 9, 2013</releaseinfo> <mediaobject> <imageobject> @@ -35,7 +35,7 @@ </mediaobject> <copyright> - <year>2011 JBoss by Red Hat</year> + <year>2013 JBoss by Red Hat</year> <holder>.</holder> </copyright> Modified: remoting2/branches/2.x/docs/userguide/en/master.xml =================================================================== --- remoting2/branches/2.x/docs/userguide/en/master.xml 2013-11-04 15:57:44 UTC (rev 6511) +++ remoting2/branches/2.x/docs/userguide/en/master.xml 2013-11-10 01:05:34 UTC (rev 6512) @@ -16,9 +16,9 @@ <bookinfo> <title>JBoss Remoting Users Guide</title> - <subtitle>JBoss Remoting version 2.5.4.SP4</subtitle> + <subtitle>JBoss Remoting version 2.5.4.SP5</subtitle> - <releaseinfo>July 25, 2012</releaseinfo> + <releaseinfo>November 9, 2013</releaseinfo> <mediaobject> <imageobject>

11 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6511 - 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: 2013-11-04 10:57:44 -0500 (Mon, 04 Nov 2013) New Revision: 6511 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java Log: JBREM-1307: Restoring TimedOutputStream changes. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2013-11-04 15:38:42 UTC (rev 6510) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2013-11-04 15:57:44 UTC (rev 6511) @@ -125,6 +125,7 @@ // Public --------------------------------------------------------------------------------------- + public String toString() { Socket socket = getSocket(); @@ -220,7 +221,7 @@ OutputStream os = socket.getOutputStream(); if (writeTimeout > 0) { - os = new TimedOutputStream(os, writeTimeout); + os = new TimedOutputStream(os, socket, writeTimeout); } if (marshaller instanceof PreferredStreamMarshaller) @@ -236,4 +237,4 @@ // Inner classes -------------------------------------------------------------------------------- -} +} \ No newline at end of file Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java 2013-11-04 15:38:42 UTC (rev 6510) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java 2013-11-04 15:57:44 UTC (rev 6511) @@ -24,17 +24,18 @@ import java.io.IOException; import java.io.OutputStream; +import java.net.Socket; import java.util.Timer; import java.util.TimerTask; import org.jboss.logging.Logger; /** - * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @author <a href="ron.sigal(a)jboss.com"Ron Sigal</a * @version $Rev$ - * <p> + * <p * Copyright April 22, 2009 - * </p> + * </p */ public class TimedOutputStream extends OutputStream { @@ -43,12 +44,14 @@ private OutputStream os; private int outputTimeout; + private Socket socket; private OutputTimerTask timerTask; private Object lock = new Object(); - public TimedOutputStream(OutputStream os, int outputTimeout) + public TimedOutputStream(OutputStream os, Socket socket, int outputTimeout) { this.os = os; + this.socket = socket; this.outputTimeout = outputTimeout; } @@ -128,6 +131,16 @@ } } + public Socket getSocket() + { + return socket; + } + + public void setSocket(Socket socket) + { + this.socket = socket; + } + static class OutputTimerTask extends TimerTask { private TimedOutputStream tos; @@ -139,16 +152,56 @@ public void run() { +// try +// { +// log.debug(this + " closing: " + tos); +// tos.close(); +// tos = null; +// } +// catch (IOException e) +// { +// log.debug("unable to close " + tos); +// } try { - log.debug(this + " closing: " + tos); - tos.close(); - tos = null; + Socket mySocket = tos.getSocket(); + if (mySocket != null) + { + // set the linger on with duration 0, results RST being sent + // and socket send and receive buffers being discarded (does not + // wait of the existing write() to complete]. There is no use in + // setting the soLingerDuration longer then 0 (thus waiting for the write to + // complete), since we've already waited "writeTimeout" seconds on this write. + // + // Thank you, Todd Sandor!! -ron + boolean on = true; + int soLingerDuration = 0; + log.debug(this + " socketWrite TIMEOUT: set soLinger(ON,0): " + tos); + mySocket.setSoLinger(on, soLingerDuration); + } } catch (IOException e) { - log.debug("unable to close " + tos); + log.debug(" socketWrite TIMEOUT: Attempting to set linger on socket stream [" + tos + + "], Exception [" + e.toString() + "]"); } + finally + { + log.debug(this + " socketWrite TIMEOUT: close(): " + tos); + try + { + tos.close(); + } + catch (Exception e) + { + // ignore - log error + log.error("Failed to close() socket stream Exception: ", e); + tos = null; + return; + } + log.debug(this + " socketWrite TIMEOUT: close() completed."); + tos = null; + } } public boolean cancel() @@ -157,4 +210,4 @@ return super.cancel(); } } -} +} \ No newline at end of file

11 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6510 - in remoting2/branches/2.x: src/main/org/jboss/remoting and 1 other directory.

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

Author: ron.sigal(a)jboss.com Date: 2013-11-04 10:38:42 -0500 (Mon, 04 Nov 2013) New Revision: 6510 Modified: remoting2/branches/2.x/build.xml remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java Log: JBREM-1325: Updating version Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2013-11-04 00:48:43 UTC (rev 6509) +++ remoting2/branches/2.x/build.xml 2013-11-04 15:38:42 UTC (rev 6510) @@ -225,9 +225,9 @@  <property name="module.name" value="remoting"/> <property name="module.Name" value="JBoss Remoting"/> - <property name="module.version" value="2.5.4.SP4"/> + <property name="module.version" value="2.5.4.SP5"/>  - <property name="module.version.extension" value="2_5_4_SP4"/> + <property name="module.version.extension" value="2_5_4_SP5"/> <property name="implementation.url" value="http://www.jboss.org/products/remoting"/> <property name="root.dir" value="${basedir}"/> @@ -2376,6 +2376,28 @@ </antcall>  +  + <antcall target="download.version"> + <param name="version" value="2.5.4.SP4-brew"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_5_4_SP4-client"/> + <param name="client.classpath" value="${etc.dir}/lib/2.5.4.SP4-brew/jboss-remoting.jar${extended.classpath}"/> + <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + <param name="clientImplementsServerIdentity" value="true"/> + <param name="serverImplementsServerIdentity" value="true"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_5_4_SP4-server"/> + <param name="server.classpath" value="${etc.dir}/lib/2.5.4.SP4-brew/jboss-remoting.jar${extended.classpath}"/> + <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + <param name="clientImplementsServerIdentity" value="true"/> + <param name="serverImplementsServerIdentity" value="true"/> + </antcall> + +   <antcall target="download.version"> <param name="version" value="2.5.4.SP3-brew"/> Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2013-11-04 00:48:43 UTC (rev 6509) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2013-11-04 15:38:42 UTC (rev 6510) @@ -40,7 +40,7 @@ public static final byte VERSION_2 = 2; public static final byte VERSION_2_2 = 22; - public static final String VERSION = "2.5.4.SP4 (Flounder)"; + public static final String VERSION = "2.5.4.SP5 (Flounder)"; private static final byte byteVersion = VERSION_2_2; private static byte defaultByteVersion = byteVersion; private static boolean performVersioning = true;

11 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6509 - 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: 2013-11-03 19:48:43 -0500 (Sun, 03 Nov 2013) New Revision: 6509 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java Log: JBREM-1307: Backing out TimedOutputStream changes due to SSL test failures. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2013-11-03 04:40:02 UTC (rev 6508) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2013-11-04 00:48:43 UTC (rev 6509) @@ -125,7 +125,6 @@ // Public --------------------------------------------------------------------------------------- - public String toString() { Socket socket = getSocket(); @@ -221,7 +220,7 @@ OutputStream os = socket.getOutputStream(); if (writeTimeout > 0) { - os = new TimedOutputStream(os, socket, writeTimeout); + os = new TimedOutputStream(os, writeTimeout); } if (marshaller instanceof PreferredStreamMarshaller) Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java 2013-11-03 04:40:02 UTC (rev 6508) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java 2013-11-04 00:48:43 UTC (rev 6509) @@ -24,18 +24,17 @@ import java.io.IOException; import java.io.OutputStream; -import java.net.Socket; import java.util.Timer; import java.util.TimerTask; import org.jboss.logging.Logger; /** - * @author <a href="ron.sigal(a)jboss.com"Ron Sigal</a + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> * @version $Rev$ - * <p + * <p> * Copyright April 22, 2009 - * </p + * </p> */ public class TimedOutputStream extends OutputStream { @@ -44,14 +43,12 @@ private OutputStream os; private int outputTimeout; - private Socket socket; private OutputTimerTask timerTask; private Object lock = new Object(); - public TimedOutputStream(OutputStream os, Socket socket, int outputTimeout) + public TimedOutputStream(OutputStream os, int outputTimeout) { this.os = os; - this.socket = socket; this.outputTimeout = outputTimeout; } @@ -131,16 +128,6 @@ } } - public Socket getSocket() - { - return socket; - } - - public void setSocket(Socket socket) - { - this.socket = socket; - } - static class OutputTimerTask extends TimerTask { private TimedOutputStream tos; @@ -152,56 +139,16 @@ public void run() { -// try -// { -// log.debug(this + " closing: " + tos); -// tos.close(); -// tos = null; -// } -// catch (IOException e) -// { -// log.debug("unable to close " + tos); -// } try { - Socket mySocket = tos.getSocket(); - if (mySocket != null) - { - // set the linger on with duration 0, results RST being sent - // and socket send and receive buffers being discarded (does not - // wait of the existing write() to complete]. There is no use in - // setting the soLingerDuration longer then 0 (thus waiting for the write to - // complete), since we've already waited "writeTimeout" seconds on this write. - // - // Thank you, Todd Sandor!! -ron - boolean on = true; - int soLingerDuration = 0; - log.debug(this + " socketWrite TIMEOUT: set soLinger(ON,0): " + tos); - mySocket.setSoLinger(on, soLingerDuration); - } + log.debug(this + " closing: " + tos); + tos.close(); + tos = null; } catch (IOException e) { - log.debug(" socketWrite TIMEOUT: Attempting to set linger on socket stream [" + tos + - "], Exception [" + e.toString() + "]"); + log.debug("unable to close " + tos); } - finally - { - log.debug(this + " socketWrite TIMEOUT: close(): " + tos); - try - { - tos.close(); - } - catch (Exception e) - { - // ignore - log error - log.error("Failed to close() socket stream Exception: ", e); - tos = null; - return; - } - log.debug(this + " socketWrite TIMEOUT: close() completed."); - tos = null; - } } public boolean cancel()

11 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6508 - in remoting2/branches/2.x/src: main/org/jboss/remoting/transport/sslbisocket and 2 other directories.

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

Author: ron.sigal(a)jboss.com Date: 2013-11-03 00:40:02 -0400 (Sun, 03 Nov 2013) New Revision: 6508 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslsocket/SSLSocketClientInvoker.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/WriteTimeoutTestParent.java Log: JBREM-1307: TimedOutputStream calls Socket.setSoLinger(true,0) before calling Socket.close(). Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2013-11-03 02:31:32 UTC (rev 6507) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2013-11-03 04:40:02 UTC (rev 6508) @@ -125,6 +125,7 @@ // Public --------------------------------------------------------------------------------------- + public String toString() { Socket socket = getSocket(); @@ -220,7 +221,7 @@ OutputStream os = socket.getOutputStream(); if (writeTimeout > 0) { - os = new TimedOutputStream(os, writeTimeout); + os = new TimedOutputStream(os, socket, writeTimeout); } if (marshaller instanceof PreferredStreamMarshaller) 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 2013-11-03 02:31:32 UTC (rev 6507) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2013-11-03 04:40:02 UTC (rev 6508) @@ -1261,8 +1261,9 @@ if (oOBInlineSet) s.setOOBInline(oOBInline); if (receiveBufferSize > -1) s.setReceiveBufferSize(receiveBufferSize); if (sendBufferSize > -1) s.setSendBufferSize(sendBufferSize); - if (soLingerSet && - soLingerDuration > 0) s.setSoLinger(soLinger, soLingerDuration); +// if (soLingerSet && +// soLingerDuration > 0) s.setSoLinger(soLinger, soLingerDuration); + if (soLingerSet) s.setSoLinger(soLinger, soLingerDuration); if (trafficClass > -1) s.setTrafficClass(trafficClass); } Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2013-11-03 02:31:32 UTC (rev 6507) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2013-11-03 04:40:02 UTC (rev 6508) @@ -767,8 +767,9 @@ if (oOBInlineSet) s.setOOBInline(oOBInline); if (receiveBufferSize > -1) s.setReceiveBufferSize(receiveBufferSize); if (sendBufferSize > -1) s.setSendBufferSize(sendBufferSize); - if (soLingerSet && - soLingerDuration > 0) s.setSoLinger(soLinger, soLingerDuration); +// if (soLingerSet && +// soLingerDuration > 0) s.setSoLinger(soLinger, soLingerDuration); + if (soLingerSet) s.setSoLinger(soLinger, soLingerDuration); if (trafficClass > -1) s.setTrafficClass(trafficClass); } Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java 2013-11-03 02:31:32 UTC (rev 6507) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/TimedOutputStream.java 2013-11-03 04:40:02 UTC (rev 6508) @@ -24,17 +24,18 @@ import java.io.IOException; import java.io.OutputStream; +import java.net.Socket; import java.util.Timer; import java.util.TimerTask; import org.jboss.logging.Logger; /** - * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @author <a href="ron.sigal(a)jboss.com"Ron Sigal</a * @version $Rev$ - * <p> + * <p * Copyright April 22, 2009 - * </p> + * </p */ public class TimedOutputStream extends OutputStream { @@ -43,12 +44,14 @@ private OutputStream os; private int outputTimeout; + private Socket socket; private OutputTimerTask timerTask; private Object lock = new Object(); - public TimedOutputStream(OutputStream os, int outputTimeout) + public TimedOutputStream(OutputStream os, Socket socket, int outputTimeout) { this.os = os; + this.socket = socket; this.outputTimeout = outputTimeout; } @@ -128,6 +131,16 @@ } } + public Socket getSocket() + { + return socket; + } + + public void setSocket(Socket socket) + { + this.socket = socket; + } + static class OutputTimerTask extends TimerTask { private TimedOutputStream tos; @@ -139,16 +152,56 @@ public void run() { +// try +// { +// log.debug(this + " closing: " + tos); +// tos.close(); +// tos = null; +// } +// catch (IOException e) +// { +// log.debug("unable to close " + tos); +// } try { - log.debug(this + " closing: " + tos); - tos.close(); - tos = null; + Socket mySocket = tos.getSocket(); + if (mySocket != null) + { + // set the linger on with duration 0, results RST being sent + // and socket send and receive buffers being discarded (does not + // wait of the existing write() to complete]. There is no use in + // setting the soLingerDuration longer then 0 (thus waiting for the write to + // complete), since we've already waited "writeTimeout" seconds on this write. + // + // Thank you, Todd Sandor!! -ron + boolean on = true; + int soLingerDuration = 0; + log.debug(this + " socketWrite TIMEOUT: set soLinger(ON,0): " + tos); + mySocket.setSoLinger(on, soLingerDuration); + } } catch (IOException e) { - log.debug("unable to close " + tos); + log.debug(" socketWrite TIMEOUT: Attempting to set linger on socket stream [" + tos + + "], Exception [" + e.toString() + "]"); } + finally + { + log.debug(this + " socketWrite TIMEOUT: close(): " + tos); + try + { + tos.close(); + } + catch (Exception e) + { + // ignore - log error + log.error("Failed to close() socket stream Exception: ", e); + tos = null; + return; + } + log.debug(this + " socketWrite TIMEOUT: close() completed."); + tos = null; + } } public boolean cancel() Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java 2013-11-03 02:31:32 UTC (rev 6507) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java 2013-11-03 04:40:02 UTC (rev 6508) @@ -209,8 +209,9 @@ if (keepAliveSet) s.setKeepAlive(keepAlive); if (receiveBufferSize > -1) s.setReceiveBufferSize(receiveBufferSize); if (sendBufferSize > -1) s.setSendBufferSize(sendBufferSize); - if (soLingerSet && - soLingerDuration > 0) s.setSoLinger(soLinger, soLingerDuration); +// if (soLingerSet && +// soLingerDuration > 0) s.setSoLinger(soLinger, soLingerDuration); + if (soLingerSet) s.setSoLinger(soLinger, soLingerDuration); if (trafficClass > -1) s.setTrafficClass(trafficClass); if (s instanceof SSLSocket) Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslsocket/SSLSocketClientInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslsocket/SSLSocketClientInvoker.java 2013-11-03 02:31:32 UTC (rev 6507) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslsocket/SSLSocketClientInvoker.java 2013-11-03 04:40:02 UTC (rev 6508) @@ -207,8 +207,9 @@ if (keepAliveSet) s.setKeepAlive(keepAlive); if (receiveBufferSize > -1) s.setReceiveBufferSize(receiveBufferSize); if (sendBufferSize > -1) s.setSendBufferSize(sendBufferSize); - if (soLingerSet && - soLingerDuration > 0) s.setSoLinger(soLinger, soLingerDuration); +// if (soLingerSet && +// soLingerDuration > 0) s.setSoLinger(soLinger, soLingerDuration); + if (soLingerSet) s.setSoLinger(soLinger, soLingerDuration); if (trafficClass > -1) s.setTrafficClass(trafficClass); if (s instanceof SSLSocket) Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/WriteTimeoutTestParent.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/WriteTimeoutTestParent.java 2013-11-03 02:31:32 UTC (rev 6507) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/WriteTimeoutTestParent.java 2013-11-03 04:40:02 UTC (rev 6508) @@ -93,7 +93,7 @@ if (firstTime) { firstTime = false; - Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO); + 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);

11 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6507 - remoting2/branches/2.x/docs/guide/en.

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

Author: ron.sigal(a)jboss.com Date: 2013-11-02 22:31:32 -0400 (Sat, 02 Nov 2013) New Revision: 6507 Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml Log: JBREM-1316: Updated documentation. Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml =================================================================== --- remoting2/branches/2.x/docs/guide/en/chap5.xml 2013-11-02 22:50:17 UTC (rev 6506) +++ remoting2/branches/2.x/docs/guide/en/chap5.xml 2013-11-03 02:31:32 UTC (rev 6507) @@ -1714,6 +1714,12 @@ invocations from artificially reducing concurrency". The default value is "true".</para> + <para><emphasis role="bold">idempotent</emphasis> - + if set to "false", indicates that an invocation should not be retried, even if + the parameter "numberOfCallRetries" is greater than 1, after the invocation + has been written to the socket. The default value is "true". + </para> + <para><emphasis role="bold">Note.</emphasis> As of Remoting version 2.4, the following socket parameters, in addition to SO_TIMEOUT and TCP_NODELAY, can be configured on the client client side: SO_KEEPALIVE,

11 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6506 - in remoting2/branches/2.x/src: tests/org/jboss/test/remoting/transport/socket and 1 other directories.

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

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

11 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits November 2013