=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java	2012-04-01 12:24:57 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java	2012-04-14 16:17:00 +0000
@@ -153,4 +153,8 @@
     {
         this.followup = followup;
     }
+
+    public void close()
+    {
+    }
 }

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingDataValue.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingDataValue.java	2012-04-01 12:04:14 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingDataValue.java	2012-04-14 16:17:00 +0000
@@ -181,4 +181,10 @@
     {
         writer.writeAttribute( FIELD_FOLLOWUP, valueOf( followup ) );
     }
+
+    @Override
+    public void close()
+    {
+        writer.closeElement();
+    }
 }

=== 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-13 10:21:57 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSet.java	2012-04-14 16:17:00 +0000
@@ -147,6 +147,10 @@
     {
         return dataValues.iterator().next();
     }
+
+    public void close()
+    {
+    }
     
     @Override
     public String toString()

=== 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:10:59 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java	2012-04-14 16:17:00 +0000
@@ -88,13 +88,11 @@
             dataValue.setStoredBy( rowSet.getString( "storedby" ) );
             dataValue.setTimestamp( getMediumDateString( rowSet.getDate( "lastupdated" ) ) );
             dataValue.setComment( rowSet.getString( "comment" ) );
-            dataValue.setFollowup( rowSet.getBoolean( "followup" ) );
-            
-            writer.closeElement();
+            dataValue.setFollowup( rowSet.getBoolean( "followup" ) );            
+            dataValue.close();
         }
         
-        writer.closeElement();
-        writer.closeDocument();
+        dataValueSet.close();
     }
     
     private String getDataValueSql( Collection<DataElement> dataElements, Collection<Period> periods, Collection<OrganisationUnit> orgUnits )

=== 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-01 12:17:55 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingDataValueSet.java	2012-04-14 16:17:00 +0000
@@ -162,5 +162,11 @@
     public void setOrgUnit( String orgUnit )
     {
         writer.writeAttribute( FIELD_ORGUNIT, orgUnit );
-    } 
+    }
+
+    public void close()
+    {
+        writer.closeElement();
+        writer.closeDocument();
+    }
 }