This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit d22327917105792db2468996fc93072797ccc551 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 19 19:51:32 2015 +0100 be able to change the validation data context in the value stack --- .../main/java/fr/ifremer/tutti/service/TuttiServiceContext.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java index d73e6aa..23c16c0 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java @@ -26,14 +26,12 @@ import com.google.common.base.Preconditions; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.opensymphony.xwork2.util.ValueStack; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.validator.xwork2.XWork2ValidatorUtil; import java.io.Closeable; import java.io.IOException; @@ -68,13 +66,11 @@ public class TuttiServiceContext implements Closeable { this(config, new TuttiDataContext()); } - public TuttiServiceContext(TuttiConfiguration config, - TuttiDataContext dataContext) { + public TuttiServiceContext(TuttiConfiguration config, TuttiDataContext dataContext) { this.config = config; this.dataContext = dataContext; // add datacontext in shared valueStack - ValueStack sharedValueStack = XWork2ValidatorUtil.getSharedValueStack(); - sharedValueStack.push(dataContext.getValidationContext()); + TuttiValidationDataContextSupport.setValidationContext(dataContext.getValidationContext(), false); this.services = CacheBuilder.newBuilder().build(new CacheLoader<Class<? extends TuttiService>, TuttiService>() { @Override public TuttiService load(Class<? extends TuttiService> key) throws Exception { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.