myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jak...@apache.org
Subject svn commit: r909483 - in /myfaces: core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
Date Fri, 12 Feb 2010 16:20:57 GMT
Author: jakobk
Date: Fri Feb 12 16:20:57 2010
New Revision: 909483

URL: http://svn.apache.org/viewvc?rev=909483&view=rev
Log:
MYFACES-2552 TagValueExpression.getType() returns null if the property in the managed bean
is null and the expression points to a facelets composite component attribute (temporal workaround)

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
    myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java?rev=909483&r1=909482&r2=909483&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java Fri
Feb 12 16:20:57 2010
@@ -105,7 +105,12 @@
         {
             Class<?> modelType = expression
                     .getType(facesContext.getELContext());
-            if (modelType.isArray())
+            if (modelType == null)
+            {
+                // FIXME temporal workaround for MYFACES-2552
+                return submittedValue;
+            }
+            else if (modelType.isArray())
             {
                 // the target should be an array
                 Class<?> componentType = modelType.getComponentType();

Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java?rev=909483&r1=909482&r2=909483&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
(original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
Fri Feb 12 16:20:57 2010
@@ -112,7 +112,12 @@
         {
             Class<?> modelType = expression
                     .getType(facesContext.getELContext());
-            if (modelType.isArray())
+            if (modelType == null)
+            {
+                // FIXME temporal workaround for MYFACES-2552
+                return submittedValue;
+            }
+            else if (modelType.isArray())
             {
                 // the target should be an array
                 Class<?> componentType = modelType.getComponentType();



Mime
View raw message