dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13947
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-02-06 13:09:18 +0700
message:
  Minor change..
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.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-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2014-02-06 05:59:21 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2014-02-06 06:09:18 +0000
@@ -187,15 +187,15 @@
 
     public static <T extends IdentifiableObject> Map<String, Object> filterFields( List<T> entityList, String fields )
     {
-        if ( entityList.isEmpty() || fields == null )
-        {
-            return Maps.newHashMap();
-        }
-
         Map<String, Object> output = Maps.newHashMap();
         ArrayList<Object> objects = Lists.newArrayList();
         output.put( "objects", objects );
 
+        if ( entityList.isEmpty() || fields == null )
+        {
+            return output;
+        }
+
         Map<String, Method> classMap = ReflectionUtils.getJacksonClassMap( entityList.get( 0 ).getClass() );
         String[] split = fields.split( "," );