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

Remove extra checks to fix #9456 (#9523)

Browse Source 
Motivation:

There are some extra log level checks (logger.isWarnEnabled()).

Modification:

Remove log level checks (logger.isWarnEnabled()) from io.netty.channel.epoll.AbstractEpollStreamChannel, io.netty.channel.DefaultFileRegion, io.netty.channel.nio.AbstractNioChannel, io.netty.util.HashedWheelTimer, io.netty.handler.stream.ChunkedWriteHandler and io.netty.channel.udt.nio.NioUdtMessageConnectorChannel

Result:

Fixes #9456
This commit is contained in:
Xiaoqin Fu 2019-08-30 01:37:30 -07:00 committed by Norman Maurer
parent 8910d62544
commit 88aa12cc1a
5 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/io/netty/util/HashedWheelTimer.java
View File

@ -266,10 +266,8 @@ public class HashedWheelTimer implements Timer {
} }
if (duration < MILLISECOND_NANOS) { if (duration < MILLISECOND_NANOS) {
if (logger.isWarnEnabled()) {
logger.warn("Configured tickDuration {} smaller then {}, using 1ms.", logger.warn("Configured tickDuration {} smaller then {}, using 1ms.",
tickDuration, MILLISECOND_NANOS); tickDuration, MILLISECOND_NANOS);
}
this.tickDuration = MILLISECOND_NANOS; this.tickDuration = MILLISECOND_NANOS;
} else { } else {
this.tickDuration = duration; this.tickDuration = duration;

2
handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
View File

@ -111,11 +111,9 @@ public class ChunkedWriteHandler implements ChannelHandler {
try { try {
doFlush(ctx); doFlush(ctx);
} catch (Exception e) { } catch (Exception e) {
if (logger.isWarnEnabled()) {
logger.warn("Unexpected exception while sending chunks.", e); logger.warn("Unexpected exception while sending chunks.", e);
} }
} }
}
@Override @Override
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {

2
transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java
View File

@ -669,12 +669,10 @@ public abstract class AbstractEpollStreamChannel extends AbstractEpollChannel im
try { try {
fd.close(); fd.close();
} catch (IOException e) { } catch (IOException e) {
if (logger.isWarnEnabled()) {
logger.warn("Error while closing a pipe", e); logger.warn("Error while closing a pipe", e);
} }
} }
} }
}
class EpollStreamUnsafe extends AbstractEpollUnsafe { class EpollStreamUnsafe extends AbstractEpollUnsafe {
// Overridden here just to be able to access this method from AbstractEpollStreamChannel // Overridden here just to be able to access this method from AbstractEpollStreamChannel

2
transport/src/main/java/io/netty/channel/DefaultFileRegion.java
View File

@ -158,11 +158,9 @@ public class DefaultFileRegion extends AbstractReferenceCounted implements FileR
try { try {
file.close(); file.close();
} catch (IOException e) { } catch (IOException e) {
if (logger.isWarnEnabled()) {
logger.warn("Failed to close a file.", e); logger.warn("Failed to close a file.", e);
} }
} }
}
@Override @Override
public FileRegion retain() { public FileRegion retain() {

2
transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java
View File

@ -80,11 +80,9 @@ public abstract class AbstractNioChannel extends AbstractChannel {
try { try {
ch.close(); ch.close();
} catch (IOException e2) { } catch (IOException e2) {
if (logger.isWarnEnabled()) {
logger.warn( logger.warn(
"Failed to close a partially initialized socket.", e2); "Failed to close a partially initialized socket.", e2);
} }
}
throw new ChannelException("Failed to enter non-blocking mode.", e); throw new ChannelException("Failed to enter non-blocking mode.", e);
} }