You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2005/05/10 22:51:44 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector Request.java
markt 2005/05/10 13:51:43
Modified: catalina/src/share/org/apache/catalina/connector
Request.java
Log:
Fix NPE when POST size exceeds limit set by maxPostSize. Also remove log attribute
since it is never used.
Revision Changes Path
1.24 +4 -9 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java
Index: Request.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Request.java 28 Apr 2005 12:30:38 -0000 1.23
+++ Request.java 10 May 2005 20:51:43 -0000 1.24
@@ -68,7 +68,7 @@
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.util.StringParser;
-import org.apache.commons.logging.Log;
+
/**
* Wrapper object for the Coyote request.
@@ -350,11 +350,6 @@
*/
protected String localName = null;
- /** After the request is mapped to a ServletContext, we can also
- * map it to a logger.
- */
- protected Log log=null;
-
// --------------------------------------------------------- Public Methods
/**
@@ -399,7 +394,6 @@
requestedSessionCookie = false;
requestedSessionId = null;
requestedSessionURL = false;
- log = null;
parameterMap.setLocked(false);
parameterMap.clear();
@@ -2347,7 +2341,8 @@
if (len > 0) {
int maxPostSize = connector.getMaxPostSize();
if ((maxPostSize > 0) && (len > maxPostSize)) {
- log.info(sm.getString("coyoteRequest.postTooLarge"));
+ context.getLogger().info
+ (sm.getString("coyoteRequest.postTooLarge"));
throw new IllegalStateException("Post too large");
}
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org