=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DefaultDataValueService.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DefaultDataValueService.java	2012-03-28 18:28:57 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DefaultDataValueService.java	2012-03-29 07:25:53 +0000
@@ -60,9 +60,6 @@
     private PeriodService periodService;
     
     @Autowired
-    private org.hisp.dhis.datavalue.DataValueService dataValueService;
-    
-    @Autowired
     private BatchHandlerFactory batchHandlerFactory;
     
     @Transactional
@@ -117,7 +114,7 @@
             
             if ( batchHandler.objectExists( internalValue ) )
             {
-                dataValueService.updateDataValue( internalValue );
+                batchHandler.updateObject( internalValue );
             }
             else
             {

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAttributeStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAttributeStore.java	2012-03-29 04:15:07 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAttributeStore.java	2012-03-29 07:25:53 +0000
@@ -102,10 +102,8 @@
     }
     
     @SuppressWarnings("unchecked")
-    @Override
     public Collection<PatientAttribute> get( Program program  )
     {
         return getCriteria( Restrictions.eq( "program", program ) ).list();
     }
-
 }