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

Use common non-magic number for shutdown timeout

Browse Source 
Motivation:

AbstractEventExecutor and AbstractEventExecutorGroup have hard-coded magic timeout numbers.  They should have the same timeout numbers, but it's easy to break that rule because they are hard-coded in each place.

Modifications:

Add package private constants to AbstractEventExecutor and let AbstractEventExecutorGroup use them.

Result:

Single timeout change affects two classes.
This commit is contained in:
Trustin Lee 2014-03-24 11:12:17 +09:00
parent 007694b963
commit 4332821e6f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java
View File

@ -29,6 +29,9 @@ import java.util.concurrent.TimeUnit;
*/ */
public abstract class AbstractEventExecutor extends AbstractExecutorService implements EventExecutor { public abstract class AbstractEventExecutor extends AbstractExecutorService implements EventExecutor {
static final long DEFAULT_SHUTDOWN_QUIET_PERIOD = 2;
static final long DEFAULT_SHUTDOWN_TIMEOUT = 15;
private final EventExecutorGroup parent; private final EventExecutorGroup parent;
protected AbstractEventExecutor() { protected AbstractEventExecutor() {
@ -61,7 +64,7 @@ public abstract class AbstractEventExecutor extends AbstractExecutorService impl
@Override @Override
public Future<?> shutdownGracefully() { public Future<?> shutdownGracefully() {
return shutdownGracefully(2, 15, TimeUnit.SECONDS); return shutdownGracefully(DEFAULT_SHUTDOWN_QUIET_PERIOD, DEFAULT_SHUTDOWN_TIMEOUT, TimeUnit.SECONDS);
} }
/** /**

4
common/src/main/java/io/netty/util/concurrent/AbstractEventExecutorGroup.java
View File

@ -23,6 +23,8 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import static io.netty.util.concurrent.AbstractEventExecutor.*;
/** /**
* Abstract base class for {@link EventExecutorGroup} implementations. * Abstract base class for {@link EventExecutorGroup} implementations.
@ -66,7 +68,7 @@ public abstract class AbstractEventExecutorGroup implements EventExecutorGroup {
@Override @Override
public Future<?> shutdownGracefully() { public Future<?> shutdownGracefully() {
return shutdownGracefully(2, 15, TimeUnit.SECONDS); return shutdownGracefully(DEFAULT_SHUTDOWN_QUIET_PERIOD, DEFAULT_SHUTDOWN_TIMEOUT, TimeUnit.SECONDS);
} }
/** /**