From 4c851bb36cb10c2ed9d725363bf657ebb7bcf581 Mon Sep 17 00:00:00 2001 From: James Holmes Date: Thu, 16 Aug 2007 14:32:53 +0000 Subject: [PATCH] WW-2015 url tag, method attribute not evaluating expressions (ognl) git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_0_X@566730 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/struts2/components/Component.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java index 57b802aa2..076b6c584 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -341,8 +341,9 @@ public class Component { boolean includeContext, boolean encodeResult, boolean forceAddSchemeHostAndPort, boolean escapeAmp) { String finalAction = findString(action); + String finalMethod = method != null ? findString(method) : method; String finalNamespace = determineNamespace(namespace, getStack(), req); - ActionMapping mapping = new ActionMapping(finalAction, finalNamespace, method, parameters); + ActionMapping mapping = new ActionMapping(finalAction, finalNamespace, finalMethod, parameters); String uri = actionMapper.getUriFromActionMapping(mapping); return UrlHelper.buildUrl(uri, req, res, parameters, scheme, includeContext, encodeResult, forceAddSchemeHostAndPort, escapeAmp); }