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

Improved selector loop shutdown time

Browse Source
This commit is contained in:
Trustin Lee 2008-08-28 11:49:22 +00:00
parent 7d1ec11787
commit ec8f441ea6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import java.nio.channels.Selector;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@ -228,7 +229,9 @@ class NioClientSocketPipelineSink extends AbstractChannelSink {
// connection attempts are made in a one-by-one manner
// instead of concurrent manner.
if (selector.keys().isEmpty()) {
if (shutdown) {
if (shutdown ||
bossExecutor instanceof ExecutorService && ((ExecutorService) bossExecutor).isShutdown()) {
synchronized (selectorGuard) {
if (selector.keys().isEmpty()) {
try {

4
src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
View File

@ -32,6 +32,7 @@ import java.nio.channels.Selector;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import org.jboss.netty.buffer.ChannelBuffer;
@ -154,7 +155,8 @@ class NioWorker implements Runnable {
// connections are registered in a one-by-one manner instead of
// concurrent manner.
if (selector.keys().isEmpty()) {
if (shutdown) {
if (shutdown ||
executor instanceof ExecutorService && ((ExecutorService) executor).isShutdown()) {
synchronized (selectorGuard) {
if (selector.keys().isEmpty()) {
try {