You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2010/03/30 22:41:12 UTC

svn commit: r929265 - in /myfaces/core/trunk/api/src/main/java/javax/faces/validator: BeanValidator.java _BeanValidatorUELUtils.java

Author: mconcini
Date: Tue Mar 30 20:41:12 2010
New Revision: 929265

URL: http://svn.apache.org/viewvc?rev=929265&view=rev
Log:
MYFACES-2636 - fix NPE in bean validation when there is no valueExpression binding.

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
    myfaces/core/trunk/api/src/main/java/javax/faces/validator/_BeanValidatorUELUtils.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java?rev=929265&r1=929264&r2=929265&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java Tue Mar 30 20:41:12 2010
@@ -510,6 +510,11 @@ final class _ValueReferenceResolver exte
      */
     public static _ValueReferenceWrapper resolve(ValueExpression valueExpression, final ELContext elCtx)
     {
+        if(valueExpression == null)
+        {
+            return null;
+        }
+        
         final _ValueReferenceResolver resolver = new _ValueReferenceResolver(elCtx.getELResolver());
         final ELContext elCtxDecorator = new _ELContextDecorator(elCtx, resolver);
         

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/_BeanValidatorUELUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/_BeanValidatorUELUtils.java?rev=929265&r1=929264&r2=929265&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/_BeanValidatorUELUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/_BeanValidatorUELUtils.java Tue Mar 30 20:41:12 2010
@@ -44,6 +44,11 @@ final class _BeanValidatorUELUtils
      */
     public static _ValueReferenceWrapper getUELValueReferenceWrapper(ValueExpression valueExpression, final ELContext elCtx)
     {
+        if(valueExpression == null)
+        {
+            return null;
+        }
+                
         ValueReference valueReference = valueExpression.getValueReference(elCtx);
         
         while (valueReference != null