dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6003
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-17 00:23:38 +0100
message:
  Minor fix
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateLockExceptionStore.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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	2012-02-16 19:20:03 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateLockExceptionStore.java	2012-02-16 23:23:38 +0000
@@ -147,7 +147,7 @@
     public long getCount( DataElement dataElement, Period period, OrganisationUnit organisationUnit )
     {
         Criteria criteria = getCriteria( 
-            Restrictions.eq( "period", period ),
+            Restrictions.eq( "period", periodService.reloadPeriod( period ) ),
             Restrictions.eq( "organisationUnit", organisationUnit ),
             Restrictions.in( "dataSet", dataElement.getDataSets() ) );
         
@@ -157,7 +157,7 @@
     public long getCount( DataSet dataSet, Period period, OrganisationUnit organisationUnit )
     {
         Criteria criteria = getCriteria( 
-            Restrictions.eq( "period", period ),
+            Restrictions.eq( "period", periodService.reloadPeriod( period ) ),
             Restrictions.eq( "organisationUnit", organisationUnit ),
             Restrictions.eq( "dataSet", dataSet ) );