Repository: activemq-artemis Updated Branches: refs/heads/master d4209b576 -> 7261eaebc
ARTEMIS-120 Upgrade Netty https://issues.apache.org/jira/browse/ARTEMIS-120 This is working around the change at https://github.com/netty/netty/commit/55fbf007f04fbba7bf50028f3c8b35d6c5ea5947 Where a message is necessary at this point Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/65d549f6 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/65d549f6 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/65d549f6 Branch: refs/heads/master Commit: 65d549f6b00fab568157ac8a9cfa3337269c07f8 Parents: d4209b5 Author: Clebert Suconic <[email protected]> Authored: Mon Jun 8 22:22:58 2015 -0400 Committer: Clebert Suconic <[email protected]> Committed: Tue Jun 9 11:00:55 2015 -0400 ---------------------------------------------------------------------- .../core/remoting/impl/netty/ActiveMQFrameDecoder2.java | 6 +++++- pom.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/65d549f6/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQFrameDecoder2.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQFrameDecoder2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQFrameDecoder2.java index f203576..8feb655 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQFrameDecoder2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQFrameDecoder2.java @@ -34,6 +34,10 @@ public class ActiveMQFrameDecoder2 extends LengthFieldBasedFrameDecoder @Override protected ByteBuf extractFrame(ChannelHandlerContext ctx, ByteBuf buffer, int index, int length) { - return super.extractFrame(ctx, buffer, index, length).skipBytes(DataConstants.SIZE_INT); + // This is a work around on https://github.com/netty/netty/commit/55fbf007f04fbba7bf50028f3c8b35d6c5ea5947 + // Right now we need a copy when sending a message on the server otherwise messages won't be resent to the client + ByteBuf frame = ctx.alloc().buffer(length); + frame.writeBytes(buffer, index, length); + return frame.skipBytes(DataConstants.SIZE_INT); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/65d549f6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5189702..192a372 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ <properties> <!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging --> <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL> - <netty.version>4.0.20.Final</netty.version> + <netty.version>4.0.28.Final</netty.version> <jetty.version>9.2.11.v20150529</jetty.version> <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version> <activemq.version.versionName>${project.version}</activemq.version.versionName>
