dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18995
committer: Halvdan Hoem Grelland <halvdanhg@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-04-23 16:04:50 +0200
message:
  Minor
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.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/message/DefaultMessageService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java	2015-04-23 12:28:34 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java	2015-04-23 14:04:50 +0000
@@ -318,8 +318,10 @@
             return null;
         }
 
-        mc.setFollowUp( mc.isFollowUp( currentUserService.getCurrentUser() ) );
-        mc.setRead( mc.isRead( currentUserService.getCurrentUser() ) );
+        User user = currentUserService.getCurrentUser();
+
+        mc.setFollowUp( mc.isFollowUp( user ) );
+        mc.setRead( mc.isRead( user ) );
 
         return messageConversationStore.getByUid( uid );
     }