Mercurial Hosting > luan
changeset 915:65e0fba5861a
minor
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Sun, 09 Oct 2016 01:52:29 -0600 |
| parents | 54308d65265a |
| children | 4de7f6e9c453 |
| files | src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java |
| diffstat | 1 files changed, 0 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java Sun Oct 09 01:22:55 2016 -0600 +++ b/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java Sun Oct 09 01:52:29 2016 -0600 @@ -45,7 +45,6 @@ { public static final Logger LOG=LoggerFactory.getLogger("org.eclipse.jetty.io.nio"); - private final boolean WORK_AROUND_JVM_BUG_6346658 = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("win"); private final SelectorManager.SelectSet _selectSet; private final SelectorManager _manager; private SelectionKey _key; @@ -764,25 +763,6 @@ @Override public void close() throws IOException { - // On unix systems there is a JVM issue that if you cancel before closing, it can - // cause the selector to block waiting for a channel to close and that channel can - // block waiting for the remote end. But on windows, if you don't cancel before a - // close, then the selector can block anyway! - // https://bugs.eclipse.org/bugs/show_bug.cgi?id=357318 - if (WORK_AROUND_JVM_BUG_6346658) - { - try - { - SelectionKey key = _key; - if (key!=null) - key.cancel(); - } - catch (Throwable e) - { - LOG.trace("",e); - } - } - try { super.close();