From 7a8c0fee0c083c04bf02df88c2ab47595c36dce0 Mon Sep 17 00:00:00 2001 From: Musachy Barroso Date: Wed, 12 Aug 2009 03:59:51 +0000 Subject: [PATCH] WW-3138 Fix DWRValidator git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@803360 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/struts2/validators/DWRValidator.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java index 87b3398d2..8c9a2eb36 100644 --- a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java +++ b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java @@ -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());