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

ARTEMIS-1158 exposing Netty.channelID properly

This commit is contained in:
Clebert Suconic 2017-05-10 18:06:46 -04:00
parent ab6806c38b
commit 02dcfe0468
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,6 @@ public class ActiveMQChannelHandler extends ChannelDuplexHandler {
@Override @Override
public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception { public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
// TODO: Think about the id thingy
listener.connectionReadyForWrites(channelId(ctx.channel()), ctx.channel().isWritable()); listener.connectionReadyForWrites(channelId(ctx.channel()), ctx.channel().isWritable());
} }
@ -107,7 +106,7 @@ public class ActiveMQChannelHandler extends ChannelDuplexHandler {
} }
} }
protected static int channelId(Channel channel) { protected static Object channelId(Channel channel) {
return channel.hashCode(); return channel.id();
} }
} }

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

@ -266,8 +266,7 @@ public class NettyConnection implements Connection {
@Override @Override
public final Object getID() { public final Object getID() {
// TODO: Think of it return channel.id();
return channel.hashCode();
} }
// This is called periodically to flush the batch buffer // This is called periodically to flush the batch buffer

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
View File

@ -111,6 +111,8 @@ public class ConsumerTest extends ActiveMQTestBase {
ClientSessionFactory sf = createSessionFactory(locator); ClientSessionFactory sf = createSessionFactory(locator);
ClientSessionFactory sf2 = createSessionFactory(locator);
ClientSession session = sf.createSession(false, true, true, true); ClientSession session = sf.createSession(false, true, true, true);
server.createQueue(QUEUE, RoutingType.ANYCAST, QUEUE, null, true, false); server.createQueue(QUEUE, RoutingType.ANYCAST, QUEUE, null, true, false);

2
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
View File

@ -44,7 +44,7 @@ public class NettyConnectionTest extends ActiveMQTestBase {
Channel channel = createChannel(); Channel channel = createChannel();
NettyConnection conn = new NettyConnection(emptyMap, channel, new MyListener(), false, false); NettyConnection conn = new NettyConnection(emptyMap, channel, new MyListener(), false, false);
Assert.assertEquals(channel.hashCode(), conn.getID()); Assert.assertEquals(channel.id(), conn.getID());
} }
@Test @Test