diff --git a/VERSION.txt b/VERSION.txt index 91d7178f6b2..1308011f5ae 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -5,6 +5,7 @@ jetty-7.2-SNAPSHOT + 319655 Reset HEAD status + JETTY-1247 synchronize recylcing of SSL NIO buffers + JETTY-1249 Apply max idle time to all connectors + + JETTY-1251 Replace then close selector for JVM bugs + Added ignore to Logger interface jetty-7.1.5.v20100705 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 193a3586a4c..a51a57a4a30 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 @@ -556,8 +556,16 @@ public abstract class SelectorManager extends AbstractLifeCycle else addChange(channel,attachment); } - _selector.close(); + Selector old_selector=_selector; _selector=new_selector; + try + { + old_selector.close(); + } + catch(Exception e) + { + Log.ignore(e); + } return; } }