--- a/src/share/classes/sun/net/httpserver/ServerImpl.java	Sat Jul 19 10:27:34 2008 +0100
+++ b/src/share/classes/sun/net/httpserver/ServerImpl.java	Wed Jul 23 12:05:19 2008 +0100
@@ -349,10 +349,8 @@ class ServerImpl implements TimeSource {
                             }
                         }
                     }
-                } catch (CancelledKeyException  e) {
+                } catch (Exception e) {
                     logger.log (Level.FINER, "Dispatcher (3)", e);
-                } catch (IOException e) {
-                    logger.log (Level.FINER, "Dispatcher (4)", e);
                 }
             }
         }
@@ -364,10 +362,10 @@ class ServerImpl implements TimeSource {
                 Exchange t = new Exchange (chan, protocol, conn);
                 executor.execute (t);
             } catch (HttpError e1) {
-                logger.log (Level.FINER, "Dispatcher (5)", e1);
+                logger.log (Level.FINER, "Dispatcher (4)", e1);
                 conn.close();
             } catch (IOException e) {
-                logger.log (Level.FINER, "Dispatcher (6)", e);
+                logger.log (Level.FINER, "Dispatcher (5)", e);
                 conn.close();
             }
         }