Author: markt
Date: Tue Jun 21 18:32:41 2011
New Revision: 1138121
URL: http://svn.apache.org/viewvc?rev=1138121&view=rev
Log:
Fix warnings in SSI package
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java Tue Jun 21
18:32:41 2011
@@ -30,6 +30,7 @@ public class SSIConditional implements S
/**
* @see SSICommand
*/
+ @Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer)
throws SSIStopProcessingException {
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java Tue Jun 21
18:32:41 2011
@@ -31,6 +31,7 @@ public final class SSIConfig implements
/**
* @see SSICommand
*/
+ @Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
for (int i = 0; i < paramNames.length; i++) {
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java Tue Jun 21 18:32:41
2011
@@ -35,6 +35,7 @@ public class SSIEcho implements SSIComma
/**
* @see SSICommand
*/
+ @Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
String encoding = DEFAULT_ENCODING;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java Tue Jun 21 18:32:41
2011
@@ -41,6 +41,7 @@ public class SSIExec implements SSIComma
/**
* @see SSICommand
*/
+ @Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
long lastModified = 0;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Tue Jun 21
18:32:41 2011
@@ -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
}
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java Tue Jun 21
18:32:41 2011
@@ -36,6 +36,7 @@ public final class SSIFlastmod implement
/**
* @see SSICommand
*/
+ @Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
long lastModified = 0;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java Tue Jun 21 18:32:41
2011
@@ -37,6 +37,7 @@ public final class SSIFsize implements S
/**
* @see SSICommand
*/
+ @Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
long lastModified = 0;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java Tue Jun 21
18:32:41 2011
@@ -32,6 +32,7 @@ public final class SSIInclude implements
/**
* @see SSICommand
*/
+ @Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
long lastModified = 0;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java Tue Jun 21
18:32:41 2011
@@ -31,6 +31,7 @@ public class SSIPrintenv implements SSIC
/**
* @see SSICommand
*/
+ @Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
long lastModified = 0;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java Tue Jun 21
18:32:41 2011
@@ -220,6 +220,7 @@ public class SSIServlet extends HttpServ
}
if (buffered) {
printWriter.flush();
+ @SuppressWarnings("null")
String text = stringWriter.toString();
res.getWriter().write(text);
}
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java Tue Jun 21 18:32:41
2011
@@ -30,6 +30,7 @@ public class SSISet implements SSIComman
/**
* @see SSICommand
*/
+ @Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer)
throws SSIStopProcessingException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
