=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/InputUtils.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/InputUtils.java	2015-10-01 11:42:39 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/InputUtils.java	2015-10-01 11:44:04 +0000
@@ -69,14 +69,14 @@
         // Attribute category combo validation
         // ---------------------------------------------------------------------
 
-        if ( (cc == null && opts != null || (cc != null && opts == null)) )
+        if ( ( cc == null && opts != null || ( cc != null && opts == null ) ) )
         {            
             throw new IllegalQueryException( "Both or none of category combination and category options must be present" ) ;
         }
 
         DataElementCategoryCombo categoryCombo = null;
 
-        if ( cc != null && (categoryCombo = idObjectManager.get( DataElementCategoryCombo.class, cc )) == null )
+        if ( cc != null && ( categoryCombo = idObjectManager.get( DataElementCategoryCombo.class, cc ) ) == null )
         {
             throw new IllegalQueryException( "Illegal category combo identifier: " + cc );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java	2015-10-01 10:05:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java	2015-10-01 11:44:04 +0000
@@ -34,11 +34,9 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;