diff options
3 files changed, 11 insertions, 10 deletions
diff --git a/VERSION.txt b/VERSION.txt index 0bd1cd45da..6ad2666a73 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -4,6 +4,7 @@ jetty-7.0.0.RC4-SNAPSHOT + 286535 ContentExchange status code + 285891 SessionAuthentication is serializable + JETTY-1079 ResourceCollection.toString + + 279820 Fixed HotSwapHandler jetty-7.0.0.RC3 7 August 2009 + 277403 remove system properties diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java index 5cf444acf2..0b0cfc611b 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java @@ -105,9 +105,6 @@ public class HandlerWrapper extends AbstractHandlerContainer } /* ------------------------------------------------------------ */ - /* - * @see org.eclipse.jetty.server.server.EventHandler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (_handler!=null && isStarted()) @@ -118,12 +115,15 @@ public class HandlerWrapper extends AbstractHandlerContainer /* ------------------------------------------------------------ */ + @Override public void setServer(Server server) { + Server old_server=getServer(); + if (server==old_server) + return; + if (isStarted()) throw new IllegalStateException(STARTED); - - Server old_server=getServer(); super.setServer(server); @@ -137,6 +137,7 @@ public class HandlerWrapper extends AbstractHandlerContainer /* ------------------------------------------------------------ */ + @Override protected Object expandChildren(Object list, Class byClass) { return expandHandler(_handler,list,byClass); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java index 5c35e0b6ba..987b1b0d01 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java @@ -68,9 +68,6 @@ public class HotSwapHandler extends AbstractHandlerContainer { try { - if (isRunning()) - throw new IllegalStateException(RUNNING); - Handler old_handler = _handler; if (getServer()!=null) @@ -137,11 +134,13 @@ public class HotSwapHandler extends AbstractHandlerContainer /* ------------------------------------------------------------ */ public void setServer(Server server) { + Server old_server=getServer(); + if (server==old_server) + return; + if (isRunning()) throw new IllegalStateException(RUNNING); - Server old_server=getServer(); - super.setServer(server); Handler h=getHandler(); |