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

This closes #374

This commit is contained in:
jbertram 2016-02-08 10:34:16 -06:00
parent 8d275de12d e9ce4ce40b
commit b6ca733c85
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
View File

@ -43,6 +43,7 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.HttpKeepAliveRunnabl
import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor;
import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector;
import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection;
import org.apache.activemq.artemis.core.remoting.impl.netty.PartialPooledByteBufAllocator;
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.artemis.core.server.protocol.stomp.WebSocketServerHandler; import org.apache.activemq.artemis.core.server.protocol.stomp.WebSocketServerHandler;
import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager;
@ -172,6 +173,11 @@ public class ProtocolHandler {
NettyServerConnection connection = channelHandler.createConnection(ctx, protocolToUse, httpEnabled); NettyServerConnection connection = channelHandler.createConnection(ctx, protocolToUse, httpEnabled);
protocolManagerToUse.handshake(connection, new ChannelBufferWrapper(in)); protocolManagerToUse.handshake(connection, new ChannelBufferWrapper(in));
pipeline.remove(this); pipeline.remove(this);
// https://issues.apache.org/jira/browse/ARTEMIS-392
// Application servers or other components may upgrade a regular socket to Netty
// We need to be able to work normally as with anything else on Artemis
ctx.channel().config().setAllocator(PartialPooledByteBufAllocator.INSTANCE);
ctx.flush(); ctx.flush();
} }