From 570bf6c580c96bdd4c780dd572edc36da254bd8d Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 20 Aug 2012 10:49:41 +1000 Subject: [PATCH] jetty-9 added some @Overrides --- .../java/org/eclipse/jetty/server/handler/HandlerWrapper.java | 2 ++ .../java/org/eclipse/jetty/server/handler/HotSwapHandler.java | 2 ++ .../java/org/eclipse/jetty/server/handler/ScopedHandler.java | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) 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 028f54e0c75..4a959a9287b 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 @@ -64,6 +64,7 @@ public class HandlerWrapper extends AbstractHandlerContainer /** * @return Returns the handlers. */ + @Override public Handler[] getHandlers() { if (_handler==null) @@ -114,6 +115,7 @@ public class HandlerWrapper extends AbstractHandlerContainer } /* ------------------------------------------------------------ */ + @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (_handler!=null && isStarted()) 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 06072649acf..b8c1be043b7 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 @@ -59,6 +59,7 @@ public class HotSwapHandler extends AbstractHandlerContainer /** * @return Returns the handlers. */ + @Override public Handler[] getHandlers() { return new Handler[] @@ -122,6 +123,7 @@ public class HotSwapHandler extends AbstractHandlerContainer /* * @see org.eclipse.jetty.server.server.EventHandler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ + @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (_handler != null && isStarted()) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ScopedHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ScopedHandler.java index ffb05ba28d4..c27489c810e 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ScopedHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ScopedHandler.java @@ -114,7 +114,7 @@ public abstract class ScopedHandler extends HandlerWrapper super.doStart(); - _nextScope= (ScopedHandler)getChildHandlerByClass(ScopedHandler.class); + _nextScope= getChildHandlerByClass(ScopedHandler.class); } finally