Author: markt
Date: Fri Mar 4 16:49:14 2011
New Revision: 1078049
URL: http://svn.apache.org/viewvc?rev=1078049&view=rev
Log:
Code clean-up
- fix FindBugs warnings
- remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/core/Constants.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=1078049&r1=1078048&r2=1078049&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Fri
Mar 4 16:49:14 2011
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.core;
-
import java.io.IOException;
import java.util.Locale;
@@ -26,8 +23,6 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.tomcat.util.res.StringManager;
-
/**
* Wrapper around a <code>javax.servlet.http.HttpServletResponse</code>
@@ -96,13 +91,6 @@ class ApplicationHttpResponse extends Ht
"org.apache.catalina.core.ApplicationHttpResponse/1.0";
- /**
- * The string manager for this package.
- */
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ------------------------------------------------ ServletResponse Methods
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java?rev=1078049&r1=1078048&r2=1078049&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java Fri Mar
4 16:49:14 2011
@@ -27,7 +27,6 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletRequestWrapper;
import org.apache.catalina.util.Enumerator;
-import org.apache.tomcat.util.res.StringManager;
/**
@@ -95,13 +94,6 @@ class ApplicationRequest extends Servlet
new HashMap<String, Object>();
- /**
- * The string manager for this package.
- */
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ------------------------------------------------- ServletRequest Methods
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java?rev=1078049&r1=1078048&r2=1078049&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java Fri Mar
4 16:49:14 2011
@@ -14,18 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.core;
-
import java.util.Locale;
import javax.servlet.ServletResponse;
import javax.servlet.ServletResponseWrapper;
-import org.apache.tomcat.util.res.StringManager;
-
/**
* Wrapper around a <code>javax.servlet.ServletResponse</code>
@@ -86,13 +81,6 @@ class ApplicationResponse extends Servle
protected boolean included = false;
- /**
- * The string manager for this package.
- */
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ------------------------------------------------ ServletResponse Methods
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1078049&r1=1078048&r2=1078049&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Fri Mar 4
16:49:14 2011
@@ -83,6 +83,7 @@ public class AsyncContextImpl implements
request.getCoyoteRequest().action(ActionCode.ASYNC_COMPLETE, null);
}
+ @Override
public void fireOnComplete() {
List<AsyncListenerWrapper> listenersCopy =
new ArrayList<AsyncListenerWrapper>();
@@ -383,7 +384,7 @@ public class AsyncContextImpl implements
"Req: %1$8s CReq: %2$8s RP: %3$8s Stage: %4$s " +
"Thread: %5$20s State: %6$20s Method: %7$11s URI: %8$s",
rHashCode, crHashCode, rpHashCode, stage,
- Thread.currentThread().getName(), "N/A", method, uri);
+ threadName, "N/A", method, uri);
if (log.isTraceEnabled()) {
log.trace(msg, new DebugException());
} else {
Modified: tomcat/trunk/java/org/apache/catalina/core/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/Constants.java?rev=1078049&r1=1078048&r2=1078049&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/Constants.java Fri Mar 4
16:49:14 2011
@@ -27,9 +27,4 @@ public class Constants {
public static final String JSP_SERVLET_CLASS =
"org.apache.jasper.servlet.JspServlet";
- public static final String JSP_SERVLET_NAME = "jsp";
- public static final String PRECOMPILE =
- System.getProperty("org.apache.jasper.Constants.PRECOMPILE",
- "jsp_precompile");
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
