tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1033865 - in /tomcat/trunk/java/org/apache/catalina/filters: AddDefaultCharsetFilter.java ExpiresFilter.java RemoteIpFilter.java RequestDumperFilter.java RequestFilter.java WebdavFixFilter.java
Date Thu, 11 Nov 2010 10:07:22 GMT
Author: markt
Date: Thu Nov 11 10:07:21 2010
New Revision: 1033865

URL: http://svn.apache.org/viewvc?rev=1033865&view=rev
Log:
Fix Eclipse warnings

Modified:
    tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1033865&r1=1033864&r2=1033865&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java Thu Nov 11
10:07:21 2010
@@ -78,6 +78,7 @@ public class AddDefaultCharsetFilter ext
         }
     }
 
+    @Override
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
         

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1033865&r1=1033864&r2=1033865&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Thu Nov 11 10:07:21 2010
@@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletReq
 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 Filte
      */
     private Map<String, ExpiresConfiguration> expiresConfigurationByContentType = new
LinkedHashMap<String, ExpiresConfiguration>();
 
+    @Override
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
         if (request instanceof HttpServletRequest &&

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1033865&r1=1033864&r2=1033865&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Thu Nov 11 10:07:21
2010
@@ -709,6 +709,7 @@ public class RemoteIpFilter implements F
      */
     private Pattern[] trustedProxies = new Pattern[0];
     
+    @Override
     public void destroy() {
         // NOOP
     }
@@ -801,6 +802,7 @@ public class RemoteIpFilter implements F
     /**
      * Wrap the incoming <code>request</code> in a {@link XForwardedRequest}
if the http header <code>x-forwareded-for</code> 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 F
         return trustedProxies;
     }
     
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
         if (filterConfig.getInitParameter(INTERNAL_PROXIES_PARAMETER) != null) {
             setInternalProxies(filterConfig.getInitParameter(INTERNAL_PROXIES_PARAMETER));

Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=1033865&r1=1033864&r2=1033865&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Thu Nov 11 10:07:21
2010
@@ -82,6 +82,7 @@ public class RequestDumperFilter impleme
      * @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 {

Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java?rev=1033865&r1=1033864&r2=1033865&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java Thu Nov 11 10:07:21 2010
@@ -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;

Modified: tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java?rev=1033865&r1=1033864&r2=1033865&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java Thu Nov 11 10:07:21
2010
@@ -74,10 +74,12 @@ public class WebdavFixFilter implements 
     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 
      * 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) ||



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message