Repository: tomee Updated Branches: refs/heads/master 08bb2dfb7 -> 7df9e6740
making LazyValidatorFactory serializable Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7df9e674 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7df9e674 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7df9e674 Branch: refs/heads/master Commit: 7df9e6740277687d8236f0b77345a2216fdd702a Parents: 08bb2df Author: rmannibucau <rmannibu...@apache.org> Authored: Wed Jun 21 08:57:00 2017 +0200 Committer: rmannibucau <rmannibu...@apache.org> Committed: Wed Jun 21 08:57:00 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/assembler/classic/Assembler.java | 2 +- .../apache/openejb/assembler/classic/LazyValidatorFactory.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/7df9e674/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index 9dca73a..18cc218 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -271,7 +271,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A public static final String OPENEJB_TIMERS_ON = "openejb.timers.on"; static final String FORCE_READ_ONLY_APP_NAMING = "openejb.forceReadOnlyAppNamingContext"; - public static final Class<?>[] VALIDATOR_FACTORY_INTERFACES = new Class<?>[]{ValidatorFactory.class}; + public static final Class<?>[] VALIDATOR_FACTORY_INTERFACES = new Class<?>[]{ValidatorFactory.class, Serializable.class}; public static final Class<?>[] VALIDATOR_INTERFACES = new Class<?>[]{Validator.class}; private final boolean skipLoaderIfPossible; http://git-wip-us.apache.org/repos/asf/tomee/blob/7df9e674/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyValidatorFactory.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyValidatorFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyValidatorFactory.java index ddb489e..6265804 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyValidatorFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyValidatorFactory.java @@ -17,6 +17,7 @@ package org.apache.openejb.assembler.classic; import javax.validation.ValidatorFactory; +import java.io.Serializable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -50,7 +51,9 @@ public class LazyValidatorFactory implements InvocationHandler { l.lock(); try { if (factory == null) { - factory = ValidatorBuilder.buildFactory(loader, info); + factory = ValidatorBuilder.buildFactory( + loader == null ? Thread.currentThread().getContextClassLoader() : loader, + info == null ? new ValidationInfo() : info); } } finally { l.unlock();
