dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19006
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-04-24 14:26:40 +0700
message:
  minor fix
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2015-04-20 16:36:41 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2015-04-24 07:26:40 +0000
@@ -465,11 +465,11 @@
 
         if ( programInstance.getStatus() != enrollment.getStatus().getValue() )
         {
-            if ( enrollment.getStatus().equals( EnrollmentStatus.CANCELLED ) )
+            if ( EnrollmentStatus.CANCELLED == enrollment.getStatus() )
             {
                 programInstanceService.cancelProgramInstanceStatus( programInstance );
             }
-            else if ( enrollment.getStatus().equals( EnrollmentStatus.COMPLETED ) )
+            else if ( EnrollmentStatus.COMPLETED == enrollment.getStatus() )
             {
                 programInstanceService.completeProgramInstanceStatus( programInstance );
             }