dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18455
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-03-02 13:21:12 +0100
message:
  Approval, fixed wrong exceptions being thrown
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.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/dataapproval/DefaultDataApprovalService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java	2015-02-26 11:19:31 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java	2015-03-02 12:21:12 +0000
@@ -209,7 +209,7 @@
             {
                 log.warn( "unapproveData: approval not found at " + da );
 
-                throw new DataMayNotBeAcceptedException();
+                throw new DataMayNotBeUnapprovedException();
             }
 
             dataApprovalStore.deleteDataApproval( d );
@@ -325,7 +325,7 @@
             {
                 log.warn( "unacceptData: approval not found at " + da );
 
-                throw new DataMayNotBeAcceptedException();
+                throw new DataMayNotBeUnacceptedException();
             }
 
             d.setAccepted( false );