You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jh...@apache.org on 2007/08/16 16:32:48 UTC
svn commit: r566729 -
/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
Author: jholmes
Date: Thu Aug 16 07:32:47 2007
New Revision: 566729
URL: http://svn.apache.org/viewvc?view=rev&rev=566729
Log:
WW-2015 url tag, method attribute not evaluating expressions (ognl)
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java?view=diff&rev=566729&r1=566728&r2=566729
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java Thu Aug 16 07:32:47 2007
@@ -342,8 +342,9 @@
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);
}