Code clean-up
- fix FindBugs warnings
- remove unused code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1078022 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java
index 33a8a67..22925c2 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -520,12 +520,10 @@
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)
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java b/java/org/apache/catalina/core/ApplicationFilterChain.java
index 5fcd278..ec87d31 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -239,7 +239,6 @@
SecurityUtil.doAsPrivilege
("doFilter", filter, classType, args, principal);
- args = null;
} else {
filter.doFilter(request, response, this);
}
@@ -301,7 +300,6 @@
classTypeUsedInService,
args,
principal);
- args = null;
} else {
servlet.service(request, response);
}
@@ -426,7 +424,6 @@
SecurityUtil.doAsPrivilege("doFilterEvent", filter,
cometClassType, args, principal);
- args = null;
} else {
filter.doFilterEvent(event, this);
}
@@ -481,7 +478,6 @@
classTypeUsedInEvent,
args,
principal);
- args = null;
} else {
((CometProcessor) servlet).event(event);
}
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index f0e8ba9..2797a57 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -110,7 +110,7 @@
/**
* The Context with which we are associated.
*/
- private Context context = null;
+ private transient Context context = null;
/**
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index a158dde..df2c973 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -39,7 +39,6 @@
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 @@
RequestDispatcher.FORWARD_QUERY_STRING };
- /**
- * The string manager for this package.
- */
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ----------------------------------------------------------- Constructors
