[seam-commits] Seam SVN: r7577 - in trunk/src: test/integration/src/org/jboss/seam/test/integration/databinding and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2008-03-14 07:47:09 -0400 (Fri, 14 Mar 2008) New Revision: 7577 Modified: trunk/src/main/org/jboss/seam/jsf/MapDataModel.java trunk/src/main/org/jboss/seam/jsf/SetDataModel.java trunk/src/test/integration/src/org/jboss/seam/test/integration/databinding/DataModelTest.java Log: JBSEAM-1660 Modified: trunk/src/main/org/jboss/seam/jsf/MapDataModel.java =================================================================== --- trunk/src/main/org/jboss/seam/jsf/MapDataModel.java 2008-03-14 06:37:23 UTC (rev 7576) +++ trunk/src/main/org/jboss/seam/jsf/MapDataModel.java 2008-03-14 11:47:09 UTC (rev 7577) @@ -131,7 +131,7 @@ @Override public void setWrappedData(Object data) { - entries = new ArrayList( ( (Map) data ).entrySet() ); + entries = data == null ? null : new ArrayList( ( (Map) data ).entrySet() ); int rowIndex = data != null ? 0 : -1; setRowIndex(rowIndex); } Modified: trunk/src/main/org/jboss/seam/jsf/SetDataModel.java =================================================================== --- trunk/src/main/org/jboss/seam/jsf/SetDataModel.java 2008-03-14 06:37:23 UTC (rev 7576) +++ trunk/src/main/org/jboss/seam/jsf/SetDataModel.java 2008-03-14 11:47:09 UTC (rev 7577) @@ -118,7 +118,7 @@ @Override public void setWrappedData(Object data) { - entries = new ArrayList( (Set) data ); + entries = data == null ? null : new ArrayList( (Set) data ); int rowIndex = data != null ? 0 : -1; setRowIndex(rowIndex); } Modified: trunk/src/test/integration/src/org/jboss/seam/test/integration/databinding/DataModelTest.java =================================================================== --- trunk/src/test/integration/src/org/jboss/seam/test/integration/databinding/DataModelTest.java 2008-03-14 06:37:23 UTC (rev 7576) +++ trunk/src/test/integration/src/org/jboss/seam/test/integration/databinding/DataModelTest.java 2008-03-14 11:47:09 UTC (rev 7577) @@ -182,8 +182,9 @@ } } - //JBSEAM-1659 - + /** + * JBSEAM-1659 + */ @Test public void testMapDataModelSerialization() throws Exception {