Author: markt
Date: Sun Oct 1 21:56:18 2006
New Revision: 451880
URL: http://svn.apache.org/viewvc?view=rev&rev=451880
Log:
Fix for bug 34956 broke the admin app (and probably a bunch of other things)
with an NPE.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java?view=diff&rev=451880&r1=451879&r2=451880
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Sun Oct 1 21:56:18 2006
@@ -974,6 +974,11 @@
ServletResponse originalResponse =
ApplicationFilterChain.getLastServicedResponse();
+ // Some forwards, eg from valves will not set original values
+ if (originalRequest == null || originalResponse == null) {
+ return;
+ }
+
boolean same = false;
ServletRequest dispatchedRequest = appRequest;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
