This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-validator. See http://git.nuiton.org/nuiton-validator.git commit a5f0c856f013a26c67ef51049d0475b66dca7e04 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 6 11:36:20 2015 +0100 fixes #3612: Clean org.nuiton.validator.xwork2.XWork2ValidatorUtil init code --- .../validator/xwork2/XWork2ValidatorUtil.java | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java b/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java index d51c2f2..e5a4c13 100644 --- a/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java +++ b/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java @@ -21,7 +21,6 @@ */ package org.nuiton.validator.xwork2; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionProxy; @@ -34,7 +33,6 @@ import com.opensymphony.xwork2.XWorkException; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; @@ -48,7 +46,6 @@ import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.NuitonValidatorScope; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -170,16 +167,22 @@ public class XWork2ValidatorUtil { if (context.getActionInvocation() == null) { // We need sometimes a ActionInvocation (see http://nuiton.org/issues/2837) - Configuration configuration = container.getInstance(Configuration.class); - UnknownHandlerConfig unknownHandlerStack = new UnknownHandlerConfig("nuiton"); - List<UnknownHandlerConfig> unknownHandlerStackList = configuration.getUnknownHandlerStack(); + // ---- + // tchemit-2015-01-06 Don't need this anymore (see http://forge.nuiton.org/issues/3612) - if (unknownHandlerStackList == null) { - unknownHandlerStackList = Lists.newArrayList(); - configuration.setUnknownHandlerStack(unknownHandlerStackList); - } - unknownHandlerStackList.add(0, unknownHandlerStack); +// Configuration configuration = container.getInstance(Configuration.class); +// +// UnknownHandlerConfig unknownHandlerStack = new UnknownHandlerConfig("nuiton"); +// List<UnknownHandlerConfig> unknownHandlerStackList = configuration.getUnknownHandlerStack(); +// +// if (unknownHandlerStackList == null) { +// unknownHandlerStackList = Lists.newArrayList(); +// configuration.setUnknownHandlerStack(unknownHandlerStackList); +// } +// unknownHandlerStackList.add(0, unknownHandlerStack); + // tchemit-2015-01-06 Don't need this anymore (see http://forge.nuiton.org/issues/3612) + // ---- Map<String, Object> extraContext = Maps.newHashMap(); extraContext.put(ActionContext.VALUE_STACK, vs); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.