diff options
| author | Greg Wilkins | 2009-11-08 12:47:32 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2009-11-08 12:47:32 +0000 |
| commit | 0ae5e31585aa089af53dd07678c597c16d4d275b (patch) | |
| tree | a3f45b6bf0b8d60584d73fa94f2f61076f0ddb80 | |
| parent | a04e60d1fe702aa17e5feaf7e580ef2a510b2636 (diff) | |
| download | org.eclipse.jetty.project-0ae5e31585aa089af53dd07678c597c16d4d275b.tar.gz org.eclipse.jetty.project-0ae5e31585aa089af53dd07678c597c16d4d275b.tar.xz org.eclipse.jetty.project-0ae5e31585aa089af53dd07678c597c16d4d275b.zip | |
JETTY-937 do not close busy server socket
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1038 7e9141cc-0065-0410-87d8-b60c137991c4
| -rw-r--r-- | jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java index 390fc1ae01..f8c771cef7 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java @@ -599,10 +599,10 @@ public abstract class SelectorManager extends AbstractLifeCycle SelectionKey busy = selector.selectedKeys().iterator().next(); if (busy==_busyKey) { - if (++_busyKeyCount>__BUSY_KEY) + if (++_busyKeyCount>__BUSY_KEY && !(busy.channel() instanceof ServerSocketChannel)) { SelectChannelEndPoint endpoint = (SelectChannelEndPoint)busy.attachment(); - Log.warn("Busy Key "+busy+" "+endpoint); + Log.warn("Busy Key "+busy.channel()+" "+endpoint); busy.cancel(); if (endpoint!=null) endpoint.close(); |