| commit | cf67eb337e36a7e8a015262907367773fedcc7a9 | [log] [tgz] |
|---|---|---|
| author | Gerhard Petracek <gpetracek@apache.org> | Tue Sep 14 12:39:15 2010 +0000 |
| committer | Gerhard Petracek <gpetracek@apache.org> | Tue Sep 14 12:39:15 2010 +0000 |
| tree | 6af29386cbfd9c36730c153e0b83891b7dc047cf | |
| parent | 8772890029b28c6ec2e84c09179d6868eae2d32f [diff] |
EXTVAL-117 git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk@996872 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java b/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java index ff190ee..e30760f 100644 --- a/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java +++ b/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java
@@ -72,8 +72,19 @@ protected void registerValidatorFactory() { - ExtValContext.getContext().addGlobalProperty(ValidatorFactory.class.getName(), - new BeanAwareValidatorFactory(BeanValidationUtils.getDefaultValidatorFactory()), false); + ValidatorFactory validatorFactory; + Object contextAwareValidatorFactory = ExtValUtils.getELHelper().getBean("contextAwareValidatorFactory"); + + if(contextAwareValidatorFactory instanceof ValidatorFactory) + { + validatorFactory = (ValidatorFactory)contextAwareValidatorFactory; + } + else + { + validatorFactory = new BeanAwareValidatorFactory(BeanValidationUtils.getDefaultValidatorFactory()); + } + + ExtValContext.getContext().addGlobalProperty(ValidatorFactory.class.getName(), validatorFactory, false); } protected void registerBeanValidationInterceptors()