← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15764: Minor fix

 

------------------------------------------------------------
revno: 15764
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-06-19 13:38:58 +0200
message:
  Minor fix
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/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/filter/DefaultFieldFilterService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFieldFilterService.java	2014-06-19 11:25:24 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFieldFilterService.java	2014-06-19 11:38:58 +0000
@@ -141,8 +141,13 @@
 
             if ( fieldValue.isTransform() )
             {
-                SizePropertyValueTransformer size = new SizePropertyValueTransformer();
-                complexNode.addChild( size.transform( property, returnValue ) );
+                SizePropertyValueTransformer transformer = new SizePropertyValueTransformer();
+
+                if ( transformer.canTransform( property, returnValue ) )
+                {
+                    complexNode.addChild( transformer.transform( property, returnValue ) );
+                }
+
             }
             else if ( fieldValue.isEmpty() )
             {