You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/03/28 16:36:45 UTC
cvs commit: jakarta-cactus/framework/src/java/share/org/apache/cactus/server AbstractServletContextWrapper.java
vmassol 02/03/28 07:36:45
Modified: framework/src/java/share/org/apache/cactus/server
AbstractServletContextWrapper.java
Log:
getRequestDispatcher can return null. Thanks to Steven Youtsey. See http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7547
Revision Changes Path
1.2 +11 -3 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractServletContextWrapper.java
Index: AbstractServletContextWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractServletContextWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractServletContextWrapper.java 1 Mar 2002 00:43:46 -0000 1.1
+++ AbstractServletContextWrapper.java 28 Mar 2002 15:36:45 -0000 1.2
@@ -78,7 +78,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: AbstractServletContextWrapper.java,v 1.1 2002/03/01 00:43:46 vmassol Exp $
+ * @version $Id: AbstractServletContextWrapper.java,v 1.2 2002/03/28 15:36:45 vmassol Exp $
*/
public abstract class AbstractServletContextWrapper implements ServletContext
{
@@ -254,9 +254,17 @@
*/
public RequestDispatcher getRequestDispatcher(String thePath)
{
- RequestDispatcher dispatcher = new RequestDispatcherWrapper(
+ RequestDispatcher wrappedDispatcher = null;
+
+ RequestDispatcher originalDispatcher =
this.originalContext.getRequestDispatcher(thePath));
- return dispatcher;
+
+ if (originalDispatcher != null) {
+ wrappedDispatcher =
+ new RequestDispatcherWrapper(originalDispatcher);
+ }
+
+ return wrappedDispatcher;
}
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>