dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15930
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-07-01 21:05:51 +0800
message:
  bugfix for field filtering, fixes double collection elements in xml
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.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/fieldfilter/DefaultFieldFilterService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.java	2014-06-26 07:46:13 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.java	2014-07-01 13:05:51 +0000
@@ -211,7 +211,7 @@
                 {
                     Collection<?> collection = (Collection<?>) returnValue;
 
-                    child = complexNode.addChild( new CollectionNode( property.getCollectionName() ) );
+                    child = new CollectionNode( property.getCollectionName() );
                     child.setNamespace( property.getNamespace() );
 
                     if ( property.isIdentifiableObject() )
@@ -267,7 +267,7 @@
             {
                 if ( property.isCollection() )
                 {
-                    child = complexNode.addChild( new CollectionNode( property.getCollectionName() ) );
+                    child = new CollectionNode( property.getCollectionName() );
                     child.setNamespace( property.getNamespace() );
 
                     for ( Object collectionObject : (Collection<?>) returnValue )