You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/01/29 00:01:02 UTC
svn commit: r904292 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
Author: jakobk
Date: Thu Jan 28 23:01:01 2010
New Revision: 904292
URL: http://svn.apache.org/viewvc?rev=904292&view=rev
Log:
MYFACES-2518 BeanValidator should not be installed if bean validation is not available
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=904292&r1=904291&r2=904292&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Thu Jan 28 23:01:01 2010
@@ -106,6 +106,7 @@
import org.apache.myfaces.shared_impl.util.StateUtils;
import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
import org.apache.myfaces.shared_impl.util.serial.SerialFactory;
+import org.apache.myfaces.util.ExternalSpecifications;
import org.apache.myfaces.view.ViewDeclarationLanguageFactoryImpl;
import org.apache.myfaces.view.facelets.tag.jsf.TagHandlerDelegateFactoryImpl;
import org.apache.myfaces.view.facelets.util.Classpath;
@@ -1726,7 +1727,9 @@
boolean defaultBeanValidatorDisabled = (disabled != null && disabled.toLowerCase().equals("true"));
for (String validatorId : dispenser.getDefaultValidatorIds())
{
- if (defaultBeanValidatorDisabled && validatorId.equals(BeanValidator.VALIDATOR_ID))
+ if (validatorId.equals(BeanValidator.VALIDATOR_ID)
+ && (defaultBeanValidatorDisabled
+ || !ExternalSpecifications.isBeanValidationAvailable))
{
// do not add it as a default validator
continue;