jfarcand 2003/06/25 12:39:09
Modified: catalina/src/share/org/apache/catalina/core
ApplicationHttpRequest.java
Log:
Fix NPE when this object is created by ApplicationContext.getNamedDispatcher.
Revision Changes Path
1.10 +9 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationHttpRequest.java 31 May 2003 14:59:56 -0000 1.9
+++ ApplicationHttpRequest.java 25 Jun 2003 19:39:09 -0000 1.10
@@ -228,7 +228,11 @@
if (name.equals(Globals.DISPATCHER_TYPE_ATTR)) {
return dispatcherType;
} else if (name.equals(Globals.DISPATCHER_REQUEST_PATH_ATTR)) {
- return requestDispatcherPath.toString();
+ if ( requestDispatcherPath != null ){
+ return requestDispatcherPath.toString();
+ } else {
+ return null;
+ }
}
int pos = getSpecial(name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
