You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2005/08/18 09:00:01 UTC

svn commit: r233292 - in /myfaces: api/trunk/src/java/javax/faces/component/UIData.java tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java

Author: mbr
Date: Wed Aug 17 23:59:50 2005
New Revision: 233292

URL: http://svn.apache.org/viewcvs?rev=233292&view=rev
Log:
fixes a NPE if setValue(...) is called
Thanks to Jon Travis for reporting

Modified:
    myfaces/api/trunk/src/java/javax/faces/component/UIData.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java

Modified: myfaces/api/trunk/src/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/UIData.java?rev=233292&r1=233291&r2=233292&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/UIData.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/UIData.java Wed Aug 17 23:59:50 2005
@@ -664,7 +664,7 @@
     {
         _value = value;
         _dataModelMap.clear();
-        _rowStates = null;
+        _rowStates.clear();
         _isValidChilds = true;
     }
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java?rev=233292&r1=233291&r2=233292&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java Wed Aug 17 23:59:50 2005
@@ -305,6 +305,17 @@
         }
         super.setValueBinding(name, binding);
     }
+    
+    /**
+     * @see javax.faces.component.UIData#setValue(java.lang.Object)
+     */
+    public void setValue(Object value)
+    {
+        super.setValue(value);
+        _dataModelMap.clear();
+        _rowStates.clear();
+        _isValidChilds = true;
+    }
 
     protected DataModel getDataModel()
     {

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java?rev=233292&r1=233291&r2=233292&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java Wed Aug 17 23:59:50 2005
@@ -224,6 +224,17 @@
         }
         return childStates;
     }
+    
+    /**
+     * @see javax.faces.component.UIData#setValue(java.lang.Object)
+     */
+    public void setValue(Object value)
+    {
+        super.setValue(value);
+        _dataModelMap.clear();
+        _cellStates.clear();
+        _isValidChilds = true;
+    }
 
     public void setValueBinding(String name, ValueBinding binding)
     {