diff options
| -rw-r--r-- | VERSION.txt | 1 | ||||
| -rw-r--r-- | jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/VERSION.txt b/VERSION.txt index bdac0f040f..9f31524ffe 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -18,6 +18,7 @@ jetty-7.0.1-SNAPSHOT + JETTY-1122 Handle multi-byte utf that causes buffer overflow + JETTY-1125 TransparentProxy incorrectly configured for test webapp + JETTY-1129 Filter control characters out of StdErrLog + + JETTY-1135 Handle connection closed before accepted during JVM bug work around + COMETD-34 Support Baeyux MBean + Fixed XSS issue in CookieDump demo servlet. + Improved start.jar usage text for properties 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 1b33306b5b..e89ca927e1 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 @@ -440,7 +440,7 @@ public abstract class SelectorManager extends AbstractLifeCycle else throw new IllegalArgumentException(o.toString()); } - catch (CancelledKeyException e) + catch (Exception e) { if (isRunning()) Log.warn(e); |