Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-09-11 00:29:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3138 Fix DWRValidator

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@803360 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Musachy Barroso
2009-08-12 03:59:51 +00:00
parent 5fdcb87b42
commit 7a8c0fee0c
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
+6 -8
View File
@@ -46,6 +46,7 @@ import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.ValidationAwareSupport;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
@@ -70,7 +71,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
public class DWRValidator {
private static final Logger LOG = LoggerFactory.getLogger(DWRValidator.class);
public ValidationAwareSupport doPost(String namespace, String action, Map params) throws Exception {
public ValidationAwareSupport doPost(String namespace, String actionName, Map params) throws Exception {
HttpServletRequest req = WebContextFactory.get().getHttpServletRequest();
ServletContext servletContext = WebContextFactory.get().getServletContext();
HttpServletResponse res = WebContextFactory.get().getHttpServletResponse();
@@ -94,16 +95,13 @@ public class DWRValidator {
servletContext);
try {
ActionMapper actionMapper = du.getContainer().getInstance(ActionMapper.class);
ActionMapping mapping = actionMapper.getMappingFromActionName(action);
ActionInvocation inv = new ValidatorActionInvocation(ctx, true);
ActionProxyFactory actionProxyFactory = du.getContainer().getInstance(ActionProxyFactory.class);
ActionProxy proxy = actionProxyFactory.createActionProxy(inv, namespace, mapping.getName(), mapping.getMethod(), true, true);
ActionProxy proxy = actionProxyFactory.createActionProxy(namespace, actionName, null, ctx, true, true);
proxy.execute();
Object a = proxy.getAction();
Object action = proxy.getAction();
if (a instanceof ValidationAware) {
ValidationAware aware = (ValidationAware) a;
if (action instanceof ValidationAware) {
ValidationAware aware = (ValidationAware) action;
ValidationAwareSupport vas = new ValidationAwareSupport();
vas.setActionErrors(aware.getActionErrors());
vas.setActionMessages(aware.getActionMessages());