------------------------------------------------------------ revno: 21208 committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Fri 2015-11-27 09:49:13 +0100 message: Minor modified: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/InMemoryQueryEngine.java 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-core/src/main/java/org/hisp/dhis/query/InMemoryQueryEngine.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/InMemoryQueryEngine.java 2015-11-17 11:48:47 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/InMemoryQueryEngine.java 2015-11-27 08:49:13 +0000 @@ -46,7 +46,7 @@ * @author Morten Olav Hansen <[email protected]> */ public class InMemoryQueryEngine<T extends IdentifiableObject> - implements QueryEngine + implements QueryEngine<T> { @Autowired private SchemaService schemaService; === 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-11-23 01:05:22 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2015-11-27 08:49:13 +0000 @@ -416,8 +416,6 @@ return new ImportSummary( ImportStatus.ERROR, "Enrollment ID was not valid." ).incrementIgnored(); } - Set<ImportConflict> importConflicts = new HashSet<>(); - saveTrackedEntityComment( programInstance, enrollment ); importSummary.setReference( enrollment.getEnrollment() );
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
