From 10dd5f6eb0485c65cba980f61e9aeb501a98d216 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 21 Jun 2011 18:32:41 +0000 Subject: [PATCH] Fix warnings in SSI package git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1138121 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/ssi/SSIConditional.java | 1 + java/org/apache/catalina/ssi/SSIConfig.java | 1 + java/org/apache/catalina/ssi/SSIEcho.java | 1 + java/org/apache/catalina/ssi/SSIExec.java | 1 + java/org/apache/catalina/ssi/SSIFilter.java | 3 +++ java/org/apache/catalina/ssi/SSIFlastmod.java | 1 + java/org/apache/catalina/ssi/SSIFsize.java | 1 + java/org/apache/catalina/ssi/SSIInclude.java | 1 + java/org/apache/catalina/ssi/SSIPrintenv.java | 1 + java/org/apache/catalina/ssi/SSIServlet.java | 1 + java/org/apache/catalina/ssi/SSISet.java | 1 + 11 files changed, 13 insertions(+) diff --git a/java/org/apache/catalina/ssi/SSIConditional.java b/java/org/apache/catalina/ssi/SSIConditional.java index 6fa933447..d855cc075 100644 --- a/java/org/apache/catalina/ssi/SSIConditional.java +++ b/java/org/apache/catalina/ssi/SSIConditional.java @@ -30,6 +30,7 @@ public class SSIConditional implements SSICommand { /** * @see SSICommand */ + @Override public long process(SSIMediator ssiMediator, String commandName, String[] paramNames, String[] paramValues, PrintWriter writer) throws SSIStopProcessingException { diff --git a/java/org/apache/catalina/ssi/SSIConfig.java b/java/org/apache/catalina/ssi/SSIConfig.java index 6a52c2b30..802b3f30f 100644 --- a/java/org/apache/catalina/ssi/SSIConfig.java +++ b/java/org/apache/catalina/ssi/SSIConfig.java @@ -31,6 +31,7 @@ public final class SSIConfig implements SSICommand { /** * @see SSICommand */ + @Override public long process(SSIMediator ssiMediator, String commandName, String[] paramNames, String[] paramValues, PrintWriter writer) { for (int i = 0; i < paramNames.length; i++) { diff --git a/java/org/apache/catalina/ssi/SSIEcho.java b/java/org/apache/catalina/ssi/SSIEcho.java index 07ec11f7f..dfaad037b 100644 --- a/java/org/apache/catalina/ssi/SSIEcho.java +++ b/java/org/apache/catalina/ssi/SSIEcho.java @@ -35,6 +35,7 @@ public class SSIEcho implements SSICommand { /** * @see SSICommand */ + @Override public long process(SSIMediator ssiMediator, String commandName, String[] paramNames, String[] paramValues, PrintWriter writer) { String encoding = DEFAULT_ENCODING; diff --git a/java/org/apache/catalina/ssi/SSIExec.java b/java/org/apache/catalina/ssi/SSIExec.java index 83922741e..32780211d 100644 --- a/java/org/apache/catalina/ssi/SSIExec.java +++ b/java/org/apache/catalina/ssi/SSIExec.java @@ -41,6 +41,7 @@ public class SSIExec implements SSICommand { /** * @see SSICommand */ + @Override public long process(SSIMediator ssiMediator, String commandName, String[] paramNames, String[] paramValues, PrintWriter writer) { long lastModified = 0; diff --git a/java/org/apache/catalina/ssi/SSIFilter.java b/java/org/apache/catalina/ssi/SSIFilter.java index 7d58f90c2..ea94187e0 100644 --- a/java/org/apache/catalina/ssi/SSIFilter.java +++ b/java/org/apache/catalina/ssi/SSIFilter.java @@ -70,6 +70,7 @@ public class SSIFilter implements Filter { * @exception ServletException * if an error occurs */ + @Override public void init(FilterConfig config) throws ServletException { this.config = config; @@ -96,6 +97,7 @@ public class SSIFilter implements Filter { "SSIFilter.init() SSI invoker started with 'debug'=" + debug); } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { // cast once @@ -180,6 +182,7 @@ public class SSIFilter implements Filter { } } + @Override public void destroy() { // NOOP } diff --git a/java/org/apache/catalina/ssi/SSIFlastmod.java b/java/org/apache/catalina/ssi/SSIFlastmod.java index 84b1cf84d..7008262a0 100644 --- a/java/org/apache/catalina/ssi/SSIFlastmod.java +++ b/java/org/apache/catalina/ssi/SSIFlastmod.java @@ -36,6 +36,7 @@ public final class SSIFlastmod implements SSICommand { /** * @see SSICommand */ + @Override public long process(SSIMediator ssiMediator, String commandName, String[] paramNames, String[] paramValues, PrintWriter writer) { long lastModified = 0; diff --git a/java/org/apache/catalina/ssi/SSIFsize.java b/java/org/apache/catalina/ssi/SSIFsize.java index af0415433..76488a848 100644 --- a/java/org/apache/catalina/ssi/SSIFsize.java +++ b/java/org/apache/catalina/ssi/SSIFsize.java @@ -37,6 +37,7 @@ public final class SSIFsize implements SSICommand { /** * @see SSICommand */ + @Override public long process(SSIMediator ssiMediator, String commandName, String[] paramNames, String[] paramValues, PrintWriter writer) { long lastModified = 0; diff --git a/java/org/apache/catalina/ssi/SSIInclude.java b/java/org/apache/catalina/ssi/SSIInclude.java index e3c86e6d0..23ef34589 100644 --- a/java/org/apache/catalina/ssi/SSIInclude.java +++ b/java/org/apache/catalina/ssi/SSIInclude.java @@ -32,6 +32,7 @@ public final class SSIInclude implements SSICommand { /** * @see SSICommand */ + @Override public long process(SSIMediator ssiMediator, String commandName, String[] paramNames, String[] paramValues, PrintWriter writer) { long lastModified = 0; diff --git a/java/org/apache/catalina/ssi/SSIPrintenv.java b/java/org/apache/catalina/ssi/SSIPrintenv.java index 4455f6bee..ab7029a77 100644 --- a/java/org/apache/catalina/ssi/SSIPrintenv.java +++ b/java/org/apache/catalina/ssi/SSIPrintenv.java @@ -31,6 +31,7 @@ public class SSIPrintenv implements SSICommand { /** * @see SSICommand */ + @Override public long process(SSIMediator ssiMediator, String commandName, String[] paramNames, String[] paramValues, PrintWriter writer) { long lastModified = 0; diff --git a/java/org/apache/catalina/ssi/SSIServlet.java b/java/org/apache/catalina/ssi/SSIServlet.java index d781750eb..04286207c 100644 --- a/java/org/apache/catalina/ssi/SSIServlet.java +++ b/java/org/apache/catalina/ssi/SSIServlet.java @@ -220,6 +220,7 @@ public class SSIServlet extends HttpServlet { } if (buffered) { printWriter.flush(); + @SuppressWarnings("null") String text = stringWriter.toString(); res.getWriter().write(text); } diff --git a/java/org/apache/catalina/ssi/SSISet.java b/java/org/apache/catalina/ssi/SSISet.java index b867768d0..d87f9d7e7 100644 --- a/java/org/apache/catalina/ssi/SSISet.java +++ b/java/org/apache/catalina/ssi/SSISet.java @@ -30,6 +30,7 @@ public class SSISet implements SSICommand { /** * @see SSICommand */ + @Override public long process(SSIMediator ssiMediator, String commandName, String[] paramNames, String[] paramValues, PrintWriter writer) throws SSIStopProcessingException { -- 2.11.0