From c159955a5b6df7f98c86e810a70bbad4cb7d6859 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 11 Nov 2010 10:07:21 +0000 Subject: [PATCH] Fix Eclipse warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1033865 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/filters/AddDefaultCharsetFilter.java | 1 + java/org/apache/catalina/filters/ExpiresFilter.java | 2 +- java/org/apache/catalina/filters/RemoteIpFilter.java | 3 +++ java/org/apache/catalina/filters/RequestDumperFilter.java | 1 + java/org/apache/catalina/filters/RequestFilter.java | 1 + java/org/apache/catalina/filters/WebdavFixFilter.java | 3 +++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java index c764f6f92..a25704621 100644 --- a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java +++ b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java @@ -78,6 +78,7 @@ public class AddDefaultCharsetFilter extends FilterBase { } } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java b/java/org/apache/catalina/filters/ExpiresFilter.java index be16ea904..f23703867 100644 --- a/java/org/apache/catalina/filters/ExpiresFilter.java +++ b/java/org/apache/catalina/filters/ExpiresFilter.java @@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.apache.catalina.filters.ExpiresFilter.XHttpServletResponse; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -1173,6 +1172,7 @@ public class ExpiresFilter extends FilterBase { */ private Map expiresConfigurationByContentType = new LinkedHashMap(); + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { if (request instanceof HttpServletRequest && diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java b/java/org/apache/catalina/filters/RemoteIpFilter.java index 597b33440..faabbc76b 100644 --- a/java/org/apache/catalina/filters/RemoteIpFilter.java +++ b/java/org/apache/catalina/filters/RemoteIpFilter.java @@ -709,6 +709,7 @@ public class RemoteIpFilter implements Filter { */ private Pattern[] trustedProxies = new Pattern[0]; + @Override public void destroy() { // NOOP } @@ -801,6 +802,7 @@ public class RemoteIpFilter implements Filter { /** * Wrap the incoming request in a {@link XForwardedRequest} if the http header x-forwareded-for is not empty. */ + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) { doFilter((HttpServletRequest)request, (HttpServletResponse)response, chain); @@ -837,6 +839,7 @@ public class RemoteIpFilter implements Filter { return trustedProxies; } + @Override public void init(FilterConfig filterConfig) throws ServletException { if (filterConfig.getInitParameter(INTERNAL_PROXIES_PARAMETER) != null) { setInternalProxies(filterConfig.getInitParameter(INTERNAL_PROXIES_PARAMETER)); diff --git a/java/org/apache/catalina/filters/RequestDumperFilter.java b/java/org/apache/catalina/filters/RequestDumperFilter.java index cf08fbf88..64f86fd60 100644 --- a/java/org/apache/catalina/filters/RequestDumperFilter.java +++ b/java/org/apache/catalina/filters/RequestDumperFilter.java @@ -82,6 +82,7 @@ public class RequestDumperFilter implements Filter { * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { diff --git a/java/org/apache/catalina/filters/RequestFilter.java b/java/org/apache/catalina/filters/RequestFilter.java index 3bc8b5dea..bd0bf06ee 100644 --- a/java/org/apache/catalina/filters/RequestFilter.java +++ b/java/org/apache/catalina/filters/RequestFilter.java @@ -173,6 +173,7 @@ public abstract class RequestFilter * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ + @Override public abstract void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException; diff --git a/java/org/apache/catalina/filters/WebdavFixFilter.java b/java/org/apache/catalina/filters/WebdavFixFilter.java index be11454b5..bb3a7d653 100644 --- a/java/org/apache/catalina/filters/WebdavFixFilter.java +++ b/java/org/apache/catalina/filters/WebdavFixFilter.java @@ -74,10 +74,12 @@ public class WebdavFixFilter implements Filter { private static final String UA_MINIDIR_5_2_3790 = "Microsoft-WebDAV-MiniRedir/5.2.3790"; + @Override public void init(FilterConfig filterConfig) throws ServletException { // NOOP } + @Override public void destroy() { // NOOP } @@ -86,6 +88,7 @@ public class WebdavFixFilter implements Filter { * Check for the broken MS WebDAV client and if detected issue a re-direct * that hopefully will cause the non-broken client to be used. */ + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { if (!(request instanceof HttpServletRequest) || -- 2.11.0