------------------------------------------------------------
revno: 13543
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Thu 2014-01-02 15:28:32 +0100
message:
Nullpointer check
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.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/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-01-02 13:45:23 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-01-02 14:28:32 +0000
@@ -413,8 +413,9 @@
@Override
public Event getEvent( String uid )
{
- ProgramStageInstance programStageInstance = programStageInstanceService.getProgramStageInstance( uid );
- return convertProgramStageInstance( programStageInstance );
+ ProgramStageInstance psi = programStageInstanceService.getProgramStageInstance( uid );
+
+ return psi != null ? convertProgramStageInstance( psi ) : null;
}
@Override
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
