Author: markt
Date: Fri Mar 4 15:52:01 2011
New Revision: 1078022
URL: http://svn.apache.org/viewvc?rev=1078022&view=rev
Log:
Code clean-up
- fix FindBugs warnings
- remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1078022&r1=1078021&r2=1078022&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Mar
4 15:52:01 2011
@@ -520,12 +520,10 @@ public class ApplicationContext
public URL getResource(String path)
throws MalformedURLException {
- if (path == null)
- throw new
MalformedURLException(sm.getString("applicationContext.requestDispatcher.iae",
path));
-
- if (!path.startsWith("/") && GET_RESOURCE_REQUIRE_SLASH)
- throw new
MalformedURLException(sm.getString("applicationContext.requestDispatcher.iae",
path));
-
+ if (path == null ||
+ !path.startsWith("/") && GET_RESOURCE_REQUIRE_SLASH)
+ throw new MalformedURLException(sm.getString(
+ "applicationContext.requestDispatcher.iae", path));
String normPath = RequestUtil.normalize(path);
if (normPath == null)
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=1078022&r1=1078021&r2=1078022&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Fri
Mar 4 15:52:01 2011
@@ -239,7 +239,6 @@ final class ApplicationFilterChain imple
SecurityUtil.doAsPrivilege
("doFilter", filter, classType, args, principal);
- args = null;
} else {
filter.doFilter(request, response, this);
}
@@ -301,7 +300,6 @@ final class ApplicationFilterChain imple
classTypeUsedInService,
args,
principal);
- args = null;
} else {
servlet.service(request, response);
}
@@ -426,7 +424,6 @@ final class ApplicationFilterChain imple
SecurityUtil.doAsPrivilege("doFilterEvent", filter,
cometClassType, args, principal);
- args = null;
} else {
filter.doFilterEvent(event, this);
}
@@ -481,7 +478,6 @@ final class ApplicationFilterChain imple
classTypeUsedInEvent,
args,
principal);
- args = null;
} else {
((CometProcessor) servlet).event(event);
}
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1078022&r1=1078021&r2=1078022&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Fri
Mar 4 15:52:01 2011
@@ -110,7 +110,7 @@ public final class ApplicationFilterConf
/**
* The Context with which we are associated.
*/
- private Context context = null;
+ private transient Context context = null;
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1078022&r1=1078021&r2=1078022&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Fri
Mar 4 15:52:01 2011
@@ -39,7 +39,6 @@ import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.RequestUtil;
-import org.apache.tomcat.util.res.StringManager;
/**
@@ -81,13 +80,6 @@ class ApplicationHttpRequest extends Htt
RequestDispatcher.FORWARD_QUERY_STRING };
- /**
- * The string manager for this package.
- */
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ----------------------------------------------------------- Constructors
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
