=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSet.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSet.java	2012-04-14 16:17:00 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSet.java	2012-04-14 16:34:07 +0000
@@ -137,7 +137,11 @@
     {
         this.dataValues = dataValues;
     }
-    
+
+    //--------------------------------------------------------------------------
+    // Logic
+    //--------------------------------------------------------------------------
+
     public boolean hasNextDataValue()
     {
         return dataValues.iterator().hasNext();
@@ -148,6 +152,11 @@
         return dataValues.iterator().next();
     }
 
+    public DataValue getDataValueInstance()
+    {
+        return new DataValue();
+    }
+    
     public void close()
     {
     }

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java	2012-04-14 16:17:00 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java	2012-04-14 16:34:07 +0000
@@ -41,7 +41,6 @@
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dxf2.datavalue.DataValue;
-import org.hisp.dhis.dxf2.datavalue.StreamingDataValue;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodType;
@@ -74,7 +73,7 @@
         
         while ( rowSet.next() )
         {
-            DataValue dataValue = new StreamingDataValue( writer );
+            DataValue dataValue = dataValueSet.getDataValueInstance();
             
             String periodType = rowSet.getString( "name" );
             Date startDate = rowSet.getDate( "startdate" );

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingDataValueSet.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingDataValueSet.java	2012-04-14 16:17:00 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingDataValueSet.java	2012-04-14 16:34:07 +0000
@@ -163,6 +163,12 @@
     {
         writer.writeAttribute( FIELD_ORGUNIT, orgUnit );
     }
+    
+    @Override
+    public DataValue getDataValueInstance()
+    {
+        return new StreamingDataValue( writer );
+    }
 
     public void close()
     {