------------------------------------------------------------
revno: 17867
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Sat 2015-01-03 11:13:50 +0100
message:
minor fix
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.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/JacksonEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java 2015-01-03 10:01:31 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java 2015-01-03 10:13:50 +0000
@@ -184,12 +184,12 @@
try
{
- Events fromXml = fromXml( input, Events.class );
- events.getEvents().addAll( fromXml.getEvents() );
+ Events fromJson = fromJson( input, Events.class );
+ events.getEvents().addAll( fromJson.getEvents() );
}
catch ( Exception ex )
{
- Event event = fromXml( input, Event.class );
+ Event event = fromJson( input, Event.class );
events.getEvents().add( event );
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
