Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 487AA18402 for ; Tue, 9 Jun 2015 16:03:45 +0000 (UTC) Received: (qmail 40129 invoked by uid 500); 9 Jun 2015 16:03:45 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 40045 invoked by uid 500); 9 Jun 2015 16:03:44 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 40036 invoked by uid 99); 9 Jun 2015 16:03:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2015 16:03:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 666FDDFF7C; Tue, 9 Jun 2015 16:03:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Tue, 09 Jun 2015 16:03:44 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: ARTEMIS-120 Upgrade Netty 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 Authored: Mon Jun 8 22:22:58 2015 -0400 Committer: Clebert Suconic 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 @@ scp://people.apache.org/x1/www/activemq.apache.org - 4.0.20.Final + 4.0.28.Final 9.2.11.v20150529 2.4 ${project.version}