jfarcand 2003/02/26 11:46:20
Modified: catalina/src/share/org/apache/catalina/core
ApplicationFilterFactory.java
Log:
Fix a NullPointerException and a ClassCastException when this value is null or when
the value is a MessageByte instance.
Revision Changes Path
1.8 +10 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java
Index: ApplicationFilterFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApplicationFilterFactory.java 30 Jan 2003 18:22:47 -0000 1.7
+++ ApplicationFilterFactory.java 26 Feb 2003 19:46:20 -0000 1.8
@@ -144,7 +144,13 @@
Integer dispatcherInt =
(Integer)request.getAttribute(DISPATCHER_TYPE_ATTR);
dispatcher = dispatcherInt.intValue();
}
- String requestPath =
(String)request.getAttribute(DISPATCHER_REQUEST_PATH_ATTR);
+ String requestPath = null;
+ Object attribute = request.getAttribute(DISPATCHER_REQUEST_PATH_ATTR);
+
+ if (attribute != null){
+ requestPath = attribute.toString();
+ }
+
HttpServletRequest hreq = null;
if (request instanceof HttpServletRequest) hreq =
(HttpServletRequest)request;
// If there is no servlet to execute, return null
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
