=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateLockExceptionStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateLockExceptionStore.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateLockExceptionStore.java	2016-03-08 09:18:12 +0000
@@ -34,7 +34,7 @@
 import org.hibernate.criterion.Restrictions;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.dataset.DataSetStore;
 import org.hisp.dhis.dataset.LockException;
 import org.hisp.dhis.dataset.LockExceptionStore;
 import org.hisp.dhis.hibernate.HibernateGenericStore;
@@ -59,11 +59,11 @@
     // Dependencies
     // -------------------------------------------------------------------------
 
-    private DataSetService dataSetService;
+    private DataSetStore dataSetStore;
 
-    public void setDataSetService( DataSetService dataSetService )
+    public void setDataSetStore( DataSetStore dataSetStore )
     {
-        this.dataSetService = dataSetService;
+        this.dataSetStore = dataSetStore;
     }
 
     private PeriodService periodService;
@@ -110,7 +110,7 @@
 
                 LockException lockException = new LockException();
                 Period period = periodService.getPeriod( periodId );
-                DataSet dataSet = dataSetService.getDataSet( dataSetId );
+                DataSet dataSet = dataSetStore.get( dataSetId );
 
                 lockException.setDataSet( dataSet );
                 lockException.setPeriod( period );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2016-03-08 09:11:11 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2016-03-08 09:18:12 +0000
@@ -154,7 +154,7 @@
     <property name="sessionFactory" ref="sessionFactory" />
     <property name="jdbcTemplate" ref="jdbcTemplate" />
     <property name="cacheable" value="true" />
-    <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
+    <property name="dataSetStore" ref="org.hisp.dhis.dataset.DataSetStore" />
     <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
   </bean>