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

Use the correct delay to schedule the task and remove not necessary if check

Browse Source
This commit is contained in:
Norman Maurer 2012-09-18 08:47:31 +02:00
parent 68777158a4
commit b1f846b0d7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
View File

@ -246,10 +246,11 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
boolean offered = registerTaskQueue.offer(registerTask); boolean offered = registerTaskQueue.offer(registerTask);
assert offered; assert offered;
} }
if (channel.connectDeadlineNanos > 0) { int timeout = channel.getConfig().getConnectTimeoutMillis();
if (timeout > 0) {
if (!channel.isConnected()) { if (!channel.isConnected()) {
channel.timoutTimer = TIMER.newTimeout(wakeupTask, channel.timoutTimer = TIMER.newTimeout(wakeupTask,
channel.connectDeadlineNanos, TimeUnit.NANOSECONDS); timeout, TimeUnit.MILLISECONDS);
} }
} }
if (wakenUp.compareAndSet(false, true)) { if (wakenUp.compareAndSet(false, true)) {
@ -360,10 +361,8 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
// Handle connection timeout every 10 milliseconds approximately. // Handle connection timeout every 10 milliseconds approximately.
long currentTimeNanos = System.nanoTime(); long currentTimeNanos = System.nanoTime();
if (currentTimeNanos - lastConnectTimeoutCheckTimeNanos >= 10 * 1000000L) { lastConnectTimeoutCheckTimeNanos = currentTimeNanos;
lastConnectTimeoutCheckTimeNanos = currentTimeNanos; processConnectTimeout(selector.keys(), currentTimeNanos);
processConnectTimeout(selector.keys(), currentTimeNanos);
}
// Exit the loop when there's nothing to handle. // Exit the loop when there's nothing to handle.
// The shutdown flag is used to delay the shutdown of this // The shutdown flag is used to delay the shutdown of this