You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/01/15 15:32:01 UTC

qpid-jms git commit: Couple minor fixes for the plain tcp transport.

Repository: qpid-jms
Updated Branches:
  refs/heads/master 5b5b67561 -> 9d47d6ac4


Couple minor fixes for the plain tcp transport.

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9d47d6ac
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9d47d6ac
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9d47d6ac

Branch: refs/heads/master
Commit: 9d47d6ac4a0fd109da80b52c1a85eff5e97eeb97
Parents: 5b5b675
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Jan 15 09:31:48 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Jan 15 09:31:48 2015 -0500

----------------------------------------------------------------------
 .../qpid/jms/transports/plain/PlainTcpTransport.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9d47d6ac/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/plain/PlainTcpTransport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/plain/PlainTcpTransport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/plain/PlainTcpTransport.java
index bb996f5..b736379 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/plain/PlainTcpTransport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/plain/PlainTcpTransport.java
@@ -39,9 +39,9 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import javax.net.SocketFactory;
 
-import org.apache.qpid.jms.transports.TransportOptions;
 import org.apache.qpid.jms.transports.Transport;
 import org.apache.qpid.jms.transports.TransportListener;
+import org.apache.qpid.jms.transports.TransportOptions;
 import org.apache.qpid.jms.util.IOExceptionSupport;
 import org.apache.qpid.jms.util.InetAddressUtil;
 import org.slf4j.Logger;
@@ -132,7 +132,7 @@ public class PlainTcpTransport implements Transport, Runnable {
         initialiseSocket(socket);
         initializeStreams();
 
-        runner = new Thread(null, this, "QpidJMS " + getClass().getSimpleName() + ": " + toString());
+        runner = new Thread(null, this, "QpidJMS-" + getClass().getSimpleName() + ":" + toString());
         runner.setDaemon(false);
         runner.start();
     }
@@ -190,7 +190,7 @@ public class PlainTcpTransport implements Transport, Runnable {
     @Override
     public void send(ByteBuffer output) throws IOException {
         checkConnected();
-        LOG.info("RawTcpTransport sending packet of size: {}", output.remaining());
+        LOG.trace("Transport sending packet of size: {}", output.remaining());
         WritableByteChannel channel = Channels.newChannel(dataOut);
         channel.write(output);
         dataOut.flush();
@@ -322,7 +322,9 @@ public class PlainTcpTransport implements Transport, Runnable {
             LOG.debug("Cannot set socket send buffer size. Reason: {}. This exception is ignored.", se.getMessage(), se);
         }
 
-        sock.setSoTimeout(options.getSoTimeout());
+        if (options.getSoTimeout() > 0) {
+            sock.setSoTimeout(options.getSoTimeout());
+        }
         sock.setKeepAlive(options.isTcpKeepAlive());
         sock.setTcpNoDelay(options.isTcpNoDelay());
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org