You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2005/08/11 04:31:24 UTC

svn commit: r231375 - /myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java

Author: svieujot
Date: Wed Aug 10 19:31:21 2005
New Revision: 231375

URL: http://svn.apache.org/viewcvs?rev=231375&view=rev
Log:
Fix NPE.

Modified:
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java?rev=231375&r1=231374&r2=231375&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java Wed Aug 10 19:31:21 2005
@@ -560,7 +560,10 @@
         if (_forceIdIndexFormula != null)
             return _forceIdIndexFormula;
         ValueBinding vb = getValueBinding("forceIdIndexFormula");
-        return vb != null ? vb.getValue(getFacesContext()).toString() : null;
+        if( vb == null )
+        	return null;
+        Object eval = vb.getValue(getFacesContext());
+        return eval == null ? null : eval.toString();
     }
     
     public void setSortColumn(String sortColumn)