husted 2004/08/24 15:53:35
Modified: src/share/org/apache/struts/taglib/html ImgTag.java
Log:
Apply #30821 "module attribute does not fully replace contextRelative" submitted by
nicolas de loof
Revision Changes Path
1.41 +16 -7
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
Index: ImgTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ImgTag.java 14 Mar 2004 06:23:46 -0000 1.40
+++ ImgTag.java 24 Aug 2004 22:53:35 -0000 1.41
@@ -31,6 +31,7 @@
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.ModuleUtils;
/**
* Generate an IMG tag to the specified image URI.
@@ -567,8 +568,12 @@
if ((this.src != null) || (this.srcKey != null) || (this.pageKey !=
null)) {
throwImgTagSrcException();
}
- ModuleConfig config =
- (ModuleConfig)
pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
+ ModuleConfig config =
+ ModuleUtils.getInstance().getModuleConfig(
+ this.module,
+ (HttpServletRequest) pageContext.getRequest(),
+ pageContext.getServletContext());
+
HttpServletRequest request = (HttpServletRequest)
pageContext.getRequest();
if (srcDefaultReference(config)) {
return (request.getContextPath() + this.page);
@@ -583,7 +588,11 @@
throwImgTagSrcException();
}
ModuleConfig config =
- (ModuleConfig)
pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
+ ModuleUtils.getInstance().getModuleConfig(
+ this.module,
+ (HttpServletRequest) pageContext.getRequest(),
+ pageContext.getServletContext());
+
HttpServletRequest request = (HttpServletRequest)
pageContext.getRequest();
if (srcDefaultReference(config)) {
return (
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
