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

Workaround JDK bug that will cause an AssertionError when calling ServerSocketChannel.config().getOptions(). (#8183)

Browse Source 
Motivation:

There is a JDK bug which will return IP_TOS as supported option for ServerSocketChannel even if its not supported afterwards and cause an AssertionError.
See http://mail.openjdk.java.net/pipermail/nio-dev/2018-August/005365.html.

Modifications:

Add a workaround for the JDK bug.

Result:

ServerSocketChannel.config().getOptions() will not throw anymore and work as expected.
This commit is contained in:
Norman Maurer 2018-08-09 13:11:08 +02:00 committed by GitHub
parent b3b04d0de2
commit 534de73d28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -703,6 +703,7 @@
<ignore>java.net.StandardProtocolFamily</ignore>
<ignore>java.nio.channels.spi.SelectorProvider</ignore>
<ignore>java.net.SocketOption</ignore>
<ignore>java.net.StandardSocketOptions</ignore>
<ignore>java.nio.channels.NetworkChannel</ignore>
<!-- Self-signed certificate generation -->

37
transport/src/main/java/io/netty/channel/socket/nio/NioChannelOption.java
View File

@ -20,6 +20,9 @@ import io.netty.channel.ChannelOption;
import java.io.IOException;
import java.nio.channels.Channel;
import java.nio.channels.ServerSocketChannel;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
/**
@ -55,6 +58,11 @@ public final class NioChannelOption<T> extends ChannelOption<T> {
if (!channel.supportedOptions().contains(option.option)) {
return false;
}
if (channel instanceof ServerSocketChannel && option.option == java.net.StandardSocketOptions.IP_TOS) {
// Skip IP_TOS as a workaround for a JDK bug:
// See http://mail.openjdk.java.net/pipermail/nio-dev/2018-August/005365.html
return false;
}
try {
channel.setOption(option.option, value);
return true;
@ -69,6 +77,11 @@ public final class NioChannelOption<T> extends ChannelOption<T> {
if (!channel.supportedOptions().contains(option.option)) {
return null;
}
if (channel instanceof ServerSocketChannel && option.option == java.net.StandardSocketOptions.IP_TOS) {
// Skip IP_TOS as a workaround for a JDK bug:
// See http://mail.openjdk.java.net/pipermail/nio-dev/2018-August/005365.html
return null;
}
try {
return channel.getOption(option.option);
} catch (IOException e) {
@ -80,12 +93,26 @@ public final class NioChannelOption<T> extends ChannelOption<T> {
static ChannelOption[] getOptions(Channel jdkChannel) {
java.nio.channels.NetworkChannel channel = (java.nio.channels.NetworkChannel) jdkChannel;
Set<java.net.SocketOption<?>> supportedOpts = channel.supportedOptions();
ChannelOption<?>[] extraOpts = new ChannelOption[supportedOpts.size()];
int i = 0;
for (java.net.SocketOption<?> opt : supportedOpts) {
extraOpts[i++] = new NioChannelOption(opt);
if (channel instanceof ServerSocketChannel) {
List<ChannelOption<?>> extraOpts = new ArrayList<ChannelOption<?>>(supportedOpts.size());
for (java.net.SocketOption<?> opt : supportedOpts) {
if (opt == java.net.StandardSocketOptions.IP_TOS) {
// Skip IP_TOS as a workaround for a JDK bug:
// See http://mail.openjdk.java.net/pipermail/nio-dev/2018-August/005365.html
continue;
}
extraOpts.add(new NioChannelOption(opt));
}
return extraOpts.toArray(new ChannelOption[0]);
} else {
ChannelOption<?>[] extraOpts = new ChannelOption[supportedOpts.size()];
int i = 0;
for (java.net.SocketOption<?> opt : supportedOpts) {
extraOpts[i++] = new NioChannelOption(opt);
}
return extraOpts;
}
return extraOpts;
}
}

10
transport/src/test/java/io/netty/channel/socket/nio/AbstractNioChannelTest.java
View File

@ -66,4 +66,14 @@ public abstract class AbstractNioChannelTest<T extends AbstractNioChannel> {
channel.unsafe().closeForcibly();
}
}
@Test
public void testGetOptions() {
T channel = newNioChannel();
try {
channel.config().getOptions();
} finally {
channel.unsafe().closeForcibly();
}
}
}