Author: markt
Date: Sat Mar 21 15:07:42 2009
New Revision: 756954
URL: http://svn.apache.org/viewvc?rev=756954&view=rev
Log:
Fix a handful of Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java?rev=756954&r1=756953&r2=756954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java Sat Mar
21 15:07:42 2009
@@ -104,9 +104,8 @@
if (nextChar == '=') {
index++;
return TOKEN_NOT_EQ;
- } else {
- return TOKEN_NOT;
}
+ return TOKEN_NOT;
case '|' :
if (nextChar == '|') {
index++;
@@ -123,16 +122,14 @@
if (nextChar == '=') {
index++;
return TOKEN_GE; // Greater than or equal
- } else {
- return TOKEN_GT; // Greater than
}
+ return TOKEN_GT; // Greater than
case '<' :
if (nextChar == '=') {
index++;
return TOKEN_LE; // Less than or equal
- } else {
- return TOKEN_LT; // Less than
}
+ return TOKEN_LT; // Less than
default :
// Otherwise it's a string
break;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=756954&r1=756953&r2=756954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Sat
Mar 21 15:07:42 2009
@@ -221,7 +221,9 @@
synchronized(RFC1123_FORMAT) {
lastModified = RFC1123_FORMAT.parse(value).getTime();
}
- } catch (Throwable ignore) { }
+ } catch (Throwable ignore) {
+ // Ignore
+ }
} else if (lname.equals(CONTENT_TYPE)) {
contentType = value;
}
@@ -243,7 +245,9 @@
synchronized(RFC1123_FORMAT) {
lastModified = RFC1123_FORMAT.parse(value).getTime();
}
- } catch (Throwable ignore) { }
+ } catch (Throwable ignore) {
+ // Ignore
+ }
}
else if (lname.equals(CONTENT_TYPE))
{
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=756954&r1=756953&r2=756954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Sat Mar 21
15:07:42 2009
@@ -177,5 +177,6 @@
}
public void destroy() {
+ // NOOP
}
}
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=756954&r1=756953&r2=756954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java Sat Mar 21
15:07:42 2009
@@ -135,7 +135,7 @@
* a value of type 'HttpServletResponse'
*/
protected void requestHandler(HttpServletRequest req,
- HttpServletResponse res) throws IOException, ServletException {
+ HttpServletResponse res) throws IOException {
ServletContext servletContext = getServletContext();
String path = SSIServletRequestUtil.getRelativePath(req);
if (debug > 0)
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=756954&r1=756953&r2=756954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
Sat Mar 21 15:07:42 2009
@@ -155,7 +155,6 @@
if (nameParts.length == 1) {
if (nameParts[0].equals("PATH")) {
requiredParts = 1;
- retVal = null; // Not implemented
}
}
else if (nameParts[0].equals("AUTH")) {
@@ -278,7 +277,7 @@
} else if (nameParts[1].equals("HOST")) {
retVal = req.getRemoteHost();
} else if (nameParts[1].equals("IDENT")) {
- retVal = null; // Not implemented
+ // Not implemented
} else if (nameParts[1].equals("PORT")) {
retVal = Integer.toString( req.getRemotePort());
} else if (nameParts[1].equals("USER")) {
@@ -403,34 +402,34 @@
if (!virtualPath.startsWith("/") && !virtualPath.startsWith("\\")) {
return new ServletContextAndPath(context,
getAbsolutePath(virtualPath));
- } else {
- String normalized = RequestUtil.normalize(virtualPath);
- if (isVirtualWebappRelative) {
- return new ServletContextAndPath(context, normalized);
- } else {
- ServletContext normContext = context.getContext(normalized);
- if (normContext == null) {
- throw new IOException("Couldn't get context for path: "
- + normalized);
- }
- //If it's the root context, then there is no context element
- // to remove,
- // ie:
- // '/file1.shtml' vs '/appName1/file1.shtml'
- if (!isRootContext(normContext)) {
- String noContext = getPathWithoutContext(
- normContext.getContextPath(), normalized);
- if (noContext == null) {
- throw new IOException(
- "Couldn't remove context from path: "
- + normalized);
- }
- return new ServletContextAndPath(normContext, noContext);
- } else {
- return new ServletContextAndPath(normContext, normalized);
- }
+ }
+
+ String normalized = RequestUtil.normalize(virtualPath);
+ if (isVirtualWebappRelative) {
+ return new ServletContextAndPath(context, normalized);
+ }
+
+ ServletContext normContext = context.getContext(normalized);
+ if (normContext == null) {
+ throw new IOException("Couldn't get context for path: "
+ + normalized);
+ }
+ //If it's the root context, then there is no context element
+ // to remove,
+ // ie:
+ // '/file1.shtml' vs '/appName1/file1.shtml'
+ if (!isRootContext(normContext)) {
+ String noContext = getPathWithoutContext(
+ normContext.getContextPath(), normalized);
+ if (noContext == null) {
+ throw new IOException(
+ "Couldn't remove context from path: "
+ + normalized);
}
+ return new ServletContextAndPath(normContext, noContext);
}
+
+ return new ServletContextAndPath(normContext, normalized);
}
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java?rev=756954&r1=756953&r2=756954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
Sat Mar 21 15:07:42 2009
@@ -27,4 +27,5 @@
* @version $Revision$, $Date$
*/
public class SSIStopProcessingException extends Exception {
+ // No specific functionality for this class
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
