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

[#5893] Ensure we not close NioDatagramChannel when SocketException is received.

Browse Source 
Motivation:

When using java.nio.DatagramChannel we should not close the channel when a SocketException was thrown as we can still use the channel.

Modifications:

Not close the Channel when SocketException is thrown

Result:

More robust and correct handling of exceptions when using NioDatagramChannel.
This commit is contained in:
Norman Maurer 2016-10-05 08:29:17 -05:00
parent a09e56850e
commit e102a008b6
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java
View File

@ -97,11 +97,7 @@ public abstract class AbstractNioMessageChannel extends AbstractNioChannel {
pipeline.fireChannelReadComplete();
if (exception != null) {
if (exception instanceof IOException && !(exception instanceof PortUnreachableException)) {
// ServerChannel should not be closed even on IOException because it can often continue
// accepting incoming connections. (e.g. too many open files)
closed = !(AbstractNioMessageChannel.this instanceof ServerChannel);
}
closed = closeOnReadError(exception);
pipeline.fireExceptionCaught(exception);
}
@ -175,6 +171,14 @@ public abstract class AbstractNioMessageChannel extends AbstractNioChannel {
return false;
}
protected boolean closeOnReadError(Throwable cause) {
// ServerChannel should not be closed even on IOException because it can often continue
// accepting incoming connections. (e.g. too many open files)
return cause instanceof IOException &&
!(cause instanceof PortUnreachableException) &&
this instanceof ServerChannel;
}
/**
* Read messages into the given array and return the amount which was read.
*/

10
transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
View File

@ -595,4 +595,14 @@ public final class NioDatagramChannel
void clearReadPending0() {
clearReadPending();
}
@Override
protected boolean closeOnReadError(Throwable cause) {
// We do not want to close on SocketException when using DatagramChannel as we usually can continue receiving.
// See https://github.com/netty/netty/issues/5893
if (cause instanceof SocketException) {
return false;
}
return super.closeOnReadError(cause);
}
}