andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bugfix in channelUDT().

Browse Source 
Motivation:

channelUDT() can't handle NioUdtByteRendezvousChannel and NioUdtMessageRendezvousChannel because those are handled by the checking condition of their parent.

Motification:

Reorder checking conditions.

Result:

Bugfixed.
This commit is contained in:
JongYoon Lim 2015-05-06 15:56:09 +09:00 committed by Norman Maurer
parent a1dfe48870
commit caac01b0f5
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtProvider.java
View File

@ -106,22 +106,24 @@ public final class NioUdtProvider<T extends UdtChannel> implements ChannelFactor
if (channel instanceof NioUdtByteAcceptorChannel) { if (channel instanceof NioUdtByteAcceptorChannel) {
return ((NioUdtByteAcceptorChannel) channel).javaChannel(); return ((NioUdtByteAcceptorChannel) channel).javaChannel();
} }
if (channel instanceof NioUdtByteConnectorChannel) {
return ((NioUdtByteConnectorChannel) channel).javaChannel();
}
if (channel instanceof NioUdtByteRendezvousChannel) { if (channel instanceof NioUdtByteRendezvousChannel) {
return ((NioUdtByteRendezvousChannel) channel).javaChannel(); return ((NioUdtByteRendezvousChannel) channel).javaChannel();
} }
if (channel instanceof NioUdtByteConnectorChannel) {
return ((NioUdtByteConnectorChannel) channel).javaChannel();
}
// message // message
if (channel instanceof NioUdtMessageAcceptorChannel) { if (channel instanceof NioUdtMessageAcceptorChannel) {
return ((NioUdtMessageAcceptorChannel) channel).javaChannel(); return ((NioUdtMessageAcceptorChannel) channel).javaChannel();
} }
if (channel instanceof NioUdtMessageConnectorChannel) {
return ((NioUdtMessageConnectorChannel) channel).javaChannel();
}
if (channel instanceof NioUdtMessageRendezvousChannel) { if (channel instanceof NioUdtMessageRendezvousChannel) {
return ((NioUdtMessageRendezvousChannel) channel).javaChannel(); return ((NioUdtMessageRendezvousChannel) channel).javaChannel();
} }
if (channel instanceof NioUdtMessageConnectorChannel) {
return ((NioUdtMessageConnectorChannel) channel).javaChannel();
}
return null; return null;
} }

40
transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtProviderTest.java
View File

@ -17,7 +17,14 @@
package io.netty.test.udt.nio; package io.netty.test.udt.nio;
import io.netty.channel.udt.UdtServerChannel; import io.netty.channel.udt.UdtServerChannel;
import io.netty.channel.udt.nio.NioUdtByteAcceptorChannel;
import io.netty.channel.udt.nio.NioUdtByteConnectorChannel;
import io.netty.channel.udt.nio.NioUdtByteRendezvousChannel;
import io.netty.channel.udt.nio.NioUdtProvider; import io.netty.channel.udt.nio.NioUdtProvider;
import io.netty.channel.udt.nio.NioUdtMessageAcceptorChannel;
import io.netty.channel.udt.nio.NioUdtMessageConnectorChannel;
import io.netty.channel.udt.nio.NioUdtMessageRendezvousChannel;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -29,15 +36,36 @@ public class NioUdtProviderTest extends AbstractUdtTest {
*/ */
@Test @Test
public void provideFactory() { public void provideFactory() {
NioUdtByteAcceptorChannel nioUdtByteAcceptorChannel
= (NioUdtByteAcceptorChannel) NioUdtProvider.BYTE_ACCEPTOR.newChannel();
NioUdtByteConnectorChannel nioUdtByteConnectorChannel
= (NioUdtByteConnectorChannel) NioUdtProvider.BYTE_CONNECTOR.newChannel();
NioUdtByteRendezvousChannel nioUdtByteRendezvousChannel
= (NioUdtByteRendezvousChannel) NioUdtProvider.BYTE_RENDEZVOUS.newChannel();
NioUdtMessageAcceptorChannel nioUdtMessageAcceptorChannel
= (NioUdtMessageAcceptorChannel) NioUdtProvider.MESSAGE_ACCEPTOR.newChannel();
NioUdtMessageConnectorChannel nioUdtMessageConnectorChannel
= (NioUdtMessageConnectorChannel) NioUdtProvider.MESSAGE_CONNECTOR.newChannel();
NioUdtMessageRendezvousChannel nioUdtMessageRendezvousChannel
= (NioUdtMessageRendezvousChannel) NioUdtProvider.MESSAGE_RENDEZVOUS.newChannel();
// bytes // bytes
assertNotNull(NioUdtProvider.BYTE_ACCEPTOR.newChannel()); assertNotNull(nioUdtByteAcceptorChannel);
assertNotNull(NioUdtProvider.BYTE_CONNECTOR.newChannel()); assertNotNull(nioUdtByteConnectorChannel);
assertNotNull(NioUdtProvider.BYTE_RENDEZVOUS.newChannel()); assertNotNull(nioUdtByteRendezvousChannel);
// message // message
assertNotNull(NioUdtProvider.MESSAGE_ACCEPTOR.newChannel()); assertNotNull(nioUdtMessageAcceptorChannel);
assertNotNull(NioUdtProvider.MESSAGE_CONNECTOR.newChannel()); assertNotNull(nioUdtMessageConnectorChannel);
assertNotNull(NioUdtProvider.MESSAGE_RENDEZVOUS.newChannel()); assertNotNull(nioUdtMessageRendezvousChannel);
// channel
assertNotNull(NioUdtProvider.channelUDT(nioUdtByteAcceptorChannel));
assertNotNull(NioUdtProvider.channelUDT(nioUdtByteConnectorChannel));
assertNotNull(NioUdtProvider.channelUDT(nioUdtByteRendezvousChannel));
assertNotNull(NioUdtProvider.channelUDT(nioUdtMessageAcceptorChannel));
assertNotNull(NioUdtProvider.channelUDT(nioUdtMessageConnectorChannel));
assertNotNull(NioUdtProvider.channelUDT(nioUdtMessageRendezvousChannel));
// acceptor types // acceptor types
assertTrue(NioUdtProvider.BYTE_ACCEPTOR.newChannel() instanceof UdtServerChannel); assertTrue(NioUdtProvider.BYTE_ACCEPTOR.newChannel() instanceof UdtServerChannel);