dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14313
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-03-20 13:18:15 +0100
message:
  minor fix
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.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/DefaultEventStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.java	2014-03-20 12:18:15 +0000
@@ -190,6 +190,11 @@
 
         while ( rowSet.next() )
         {
+            if ( rowSet.getString( "psi_uid" ) == null || rowSet.getString( "ou_uid" ) == null )
+            {
+                continue;
+            }
+
             if ( !event.getEvent().equals( rowSet.getString( "psi_uid" ) ) )
             {
                 event = new Event();
@@ -236,6 +241,11 @@
                 events.add( event );
             }
 
+            if ( rowSet.getString( "pdv_value" ) == null || rowSet.getString( "de_uid" ) == null )
+            {
+                continue;
+            }
+
             DataValue dataValue = new DataValue();
             dataValue.setValue( rowSet.getString( "pdv_value" ) );
             dataValue.setProvidedElsewhere( rowSet.getBoolean( "pdv_providedelsewhere" ) );