rleland 2002/10/15 11:10:52
Modified: src/share/org/apache/struts/util RequestUtils.java
Log:
Fix bug introduced by factoring out Application Config.
config was not getting set.
-Rob
Revision Changes Path
1.62 +13 -6
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- RequestUtils.java 15 Oct 2002 17:37:25 -0000 1.61
+++ RequestUtils.java 15 Oct 2002 18:10:52 -0000 1.62
@@ -387,8 +387,15 @@
}
// Look up the application module configuration for this request
- ApplicationConfig config = getApplicationConfig(pageContext);
-
+ ApplicationConfig config = (ApplicationConfig)
+ pageContext.getRequest().getAttribute(Action.APPLICATION_KEY);
+ if (config == null) { // Backwards compatibility hack
+ config = (ApplicationConfig)
+ pageContext.getServletContext().getAttribute
+ (Action.APPLICATION_KEY);
+ pageContext.getRequest().setAttribute(Action.APPLICATION_KEY,
+ config);
+ }
// Calculate the appropriate URL
StringBuffer url = new StringBuffer();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
