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/01/06 23:07:25 UTC
qpid-jms git commit: QPIDJMS-246: Update Netty to 4.1.6 and fix use
of deprecated methods
Repository: qpid-jms
Updated Branches:
refs/heads/master 28662b35b -> 713c4b344
QPIDJMS-246: Update Netty to 4.1.6 and fix use of deprecated methods
Move to latest Netty release and update calls to Netty methods that were
previously deprecated
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/713c4b34
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/713c4b34
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/713c4b34
Branch: refs/heads/master
Commit: 713c4b344af8a74cc206eca9fc3b4d22b1aacd9d
Parents: 28662b3
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Jan 6 18:07:18 2017 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Jan 6 18:07:18 2017 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../qpid/jms/transports/netty/NettyWsTransport.java | 2 +-
.../org/apache/qpid/jms/transports/netty/NettyServer.java | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/713c4b34/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 87fec07..f4a224c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<!-- Dependency Versions for this Project -->
<proton-version>0.16.0</proton-version>
- <netty-version>4.1.5.Final</netty-version>
+ <netty-version>4.1.6.Final</netty-version>
<slf4j-version>1.7.21</slf4j-version>
<geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
<!-- Test Dependency Versions for this Project -->
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/713c4b34/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyWsTransport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyWsTransport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyWsTransport.java
index 0539495..3eff143 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyWsTransport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/NettyWsTransport.java
@@ -142,7 +142,7 @@ public class NettyWsTransport extends NettyTcpTransport {
if (message instanceof FullHttpResponse) {
FullHttpResponse response = (FullHttpResponse) message;
throw new IllegalStateException(
- "Unexpected FullHttpResponse (getStatus=" + response.getStatus() +
+ "Unexpected FullHttpResponse (getStatus=" + response.status() +
", content=" + response.content().toString(StandardCharsets.UTF_8) + ')');
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/713c4b34/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyServer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyServer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyServer.java
index 28bc72c..e7a3460 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyServer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyServer.java
@@ -55,9 +55,9 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.handler.codec.http.DefaultFullHttpResponse;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.HttpObjectAggregator;
import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.codec.http.HttpUtil;
import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
import io.netty.handler.codec.http.websocketx.WebSocketFrame;
import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
@@ -316,16 +316,16 @@ public abstract class NettyServer implements AutoCloseable {
private static void sendHttpResponse(ChannelHandlerContext ctx, FullHttpRequest request, FullHttpResponse response) {
// Generate an error page if response getStatus code is not OK (200).
- if (response.getStatus().code() != 200) {
- ByteBuf buf = Unpooled.copiedBuffer(response.getStatus().toString(), StandardCharsets.UTF_8);
+ if (response.status().code() != 200) {
+ ByteBuf buf = Unpooled.copiedBuffer(response.status().toString(), StandardCharsets.UTF_8);
response.content().writeBytes(buf);
buf.release();
- HttpHeaders.setContentLength(response, response.content().readableBytes());
+ HttpUtil.setContentLength(response, response.content().readableBytes());
}
// Send the response and close the connection if necessary.
ChannelFuture f = ctx.channel().writeAndFlush(response);
- if (!HttpHeaders.isKeepAlive(request) || response.getStatus().code() != 200) {
+ if (!HttpUtil.isKeepAlive(request) || response.status().code() != 200) {
f.addListener(ChannelFutureListener.CLOSE);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org