=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/JacksonEnrollmentService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/JacksonEnrollmentService.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/JacksonEnrollmentService.java 2014-11-06 13:26:50 +0000 @@ -104,14 +104,12 @@ for ( Enrollment enrollment : enrollments.getEnrollments() ) { - enrollment.setEnrollment( null ); importSummaries.addImportSummary( addEnrollment( enrollment ) ); } } catch ( Exception ex ) { Enrollment enrollment = fromJson( input, Enrollment.class ); - enrollment.setEnrollment( null ); importSummaries.addImportSummary( addEnrollment( enrollment ) ); } @@ -130,14 +128,12 @@ for ( Enrollment enrollment : enrollments.getEnrollments() ) { - enrollment.setEnrollment( null ); importSummaries.addImportSummary( addEnrollment( enrollment ) ); } } catch ( Exception ex ) { Enrollment enrollment = fromXml( input, Enrollment.class ); - enrollment.setEnrollment( null ); importSummaries.addImportSummary( addEnrollment( enrollment ) ); } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/JacksonTrackedEntityInstanceService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/JacksonTrackedEntityInstanceService.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/JacksonTrackedEntityInstanceService.java 2014-11-06 13:26:50 +0000 @@ -131,14 +131,12 @@ for ( TrackedEntityInstance trackedEntityInstance : trackedEntityInstances.getTrackedEntityInstances() ) { - trackedEntityInstance.setTrackedEntityInstance( null ); importSummaries.addImportSummary( addTrackedEntityInstance( trackedEntityInstance ) ); } } catch ( Exception ex ) { TrackedEntityInstance trackedEntityInstance = fromJson( input, TrackedEntityInstance.class ); - trackedEntityInstance.setTrackedEntityInstance( null ); importSummaries.addImportSummary( addTrackedEntityInstance( trackedEntityInstance ) ); }