=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/InOperator.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/InOperator.java 2016-01-08 16:26:00 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/InOperator.java 2016-01-08 17:11:16 +0000 @@ -76,47 +76,47 @@ return false; } - private boolean compare( Type type, Object item, Object object ) + private boolean compare( Type type, Object lside, Object rside ) { if ( type.isString() ) { - String s1 = getValue( String.class, item ); - String s2 = (String) object; + String s1 = getValue( String.class, lside ); + String s2 = (String) rside; return s1 != null && s2.equals( s1 ); } else if ( type.isBoolean() ) { - Boolean s1 = getValue( Boolean.class, item ); - Boolean s2 = (Boolean) object; + Boolean s1 = getValue( Boolean.class, lside ); + Boolean s2 = (Boolean) rside; return s1 != null && s2.equals( s1 ); } else if ( type.isInteger() ) { - Integer s1 = getValue( Integer.class, item ); - Integer s2 = (Integer) object; + Integer s1 = getValue( Integer.class, lside ); + Integer s2 = (Integer) rside; return s1 != null && s2.equals( s1 ); } else if ( type.isFloat() ) { - Float s1 = getValue( Float.class, item ); - Float s2 = (Float) object; + Float s1 = getValue( Float.class, lside ); + Float s2 = (Float) rside; return s1 != null && s2.equals( s1 ); } else if ( type.isDate() ) { - Date s1 = getValue( Date.class, item ); - Date s2 = (Date) object; + Date s1 = getValue( Date.class, lside ); + Date s2 = (Date) rside; return s1 != null && s2.equals( s1 ); } else if ( type.isEnum() ) { - String s1 = String.valueOf( item ); - String s2 = String.valueOf( object ); + String s1 = String.valueOf( lside ); + String s2 = String.valueOf( rside ); return s1 != null && s2.equals( s1 ); }