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 2017/11/16 16:55:45 UTC
qpid-jms git commit: QPIDJMS-347 Update to latest netty release
4.1.17.Final
Repository: qpid-jms
Updated Branches:
refs/heads/master 4ef226b97 -> dcd80f5f0
QPIDJMS-347 Update to latest netty release 4.1.17.Final
Update to latest netty release and make a few fixes that protect against
bad unit tests operating directly on the netty based 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/dcd80f5f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/dcd80f5f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/dcd80f5f
Branch: refs/heads/master
Commit: dcd80f5f0ba21065569a552b0cfeb3d1a71f2c77
Parents: 4ef226b
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Nov 16 11:55:27 2017 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Nov 16 11:55:27 2017 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../apache/qpid/jms/transports/netty/NettyTcpTransport.java | 7 +------
.../qpid/jms/transports/netty/NettyTcpTransportTest.java | 7 ++++---
3 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dcd80f5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 194c332..fec2373 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<!-- Dependency Versions for this Project -->
<proton-version>0.23.0</proton-version>
- <netty-version>4.1.16.Final</netty-version>
+ <netty-version>4.1.17.Final</netty-version>
<slf4j-version>1.7.25</slf4j-version>
<geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dcd80f5f/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java
index 58ee073..d1e7ee0 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyTcpTransport.java
@@ -261,12 +261,7 @@ public class NettyTcpTransport implements Transport {
public void send(ByteBuf output) throws IOException {
checkConnected(output);
- int length = output.readableBytes();
- if (length == 0) {
- return;
- }
-
- LOG.trace("Attempted write of: {} bytes", length);
+ LOG.trace("Attempted write of: {} bytes", output.readableBytes());
channel.writeAndFlush(output);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dcd80f5f/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java
index 68a5cb5..3d150f5 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java
@@ -31,9 +31,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import io.netty.channel.epoll.Epoll;
-import io.netty.channel.kqueue.KQueue;
-import io.netty.channel.kqueue.KQueueEventLoopGroup;
import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.apache.qpid.jms.test.Wait;
import org.apache.qpid.jms.transports.Transport;
@@ -46,7 +43,10 @@ import org.slf4j.LoggerFactory;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
+import io.netty.channel.epoll.Epoll;
import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.kqueue.KQueue;
+import io.netty.channel.kqueue.KQueueEventLoopGroup;
import io.netty.util.ResourceLeakDetector;
import io.netty.util.ResourceLeakDetector.Level;
@@ -492,6 +492,7 @@ public class NettyTcpTransportTest extends QpidJmsTestCase {
assertTrue(transport.isConnected());
ByteBuf sendBuffer = transport.allocateSendBuffer(10 * 1024 * 1024);
+ sendBuffer.writeBytes(new byte[] {0, 1, 2, 3, 4});
transport.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org