Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-120 Upgrade Netty 

https://issues.apache.org/jira/browse/ARTEMIS-120

This is working around the change at 55fbf007f0
Where a message is necessary at this point
This commit is contained in:
Clebert Suconic 2015-06-08 22:22:58 -04:00
parent d4209b5761
commit 65d549f6b0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQFrameDecoder2.java
View File

@ -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);
}
}

2
pom.xml
View File

@ -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>