You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/08/31 15:26:21 UTC
svn commit: r265041 - in /myfaces/api/trunk/src/java/javax/faces:
model/ResultSetDataModel.java webapp/AttributeTag.java
Author: mmarinschek
Date: Wed Aug 31 06:26:17 2005
New Revision: 265041
URL: http://svn.apache.org/viewcvs?rev=265041&view=rev
Log:
final fix for MYFACES-458
Modified:
myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java
myfaces/api/trunk/src/java/javax/faces/webapp/AttributeTag.java
Modified: myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java?rev=265041&r1=265040&r2=265041&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java Wed Aug 31 06:26:17 2005
@@ -23,6 +23,7 @@
/**
* @author Thomas Spiegl (latest modification by $Author$)
+ * @author Martin Marinschek
* @version $Revision$ $Date$
*/
public class ResultSetDataModel extends DataModel
Modified: myfaces/api/trunk/src/java/javax/faces/webapp/AttributeTag.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/webapp/AttributeTag.java?rev=265041&r1=265040&r2=265041&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/webapp/AttributeTag.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/webapp/AttributeTag.java Wed Aug 31 06:26:17 2005
@@ -58,7 +58,10 @@
String name = getName();
if (component.getAttributes().get(name) == null)
{
- component.getAttributes().put(name, getValue());
+ Object value = getValue();
+
+ if(value != null)
+ component.getAttributes().put(name, getValue());
}
return Tag.SKIP_BODY;
}