=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java 2014-03-14 10:40:06 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java 2014-03-14 10:56:43 +0000 @@ -38,6 +38,7 @@ import org.hisp.dhis.system.util.ReflectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -145,6 +146,7 @@ Map value = fieldMap.get( key ); ReflectionUtils.PropertyDescriptor descriptor = classMap.get( key ); + Object returned = ReflectionUtils.invokeMethod( object, descriptor.getMethod() ); if ( returned == null ) === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ReflectionUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ReflectionUtils.java 2014-03-13 14:27:16 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ReflectionUtils.java 2014-03-14 10:56:43 +0000 @@ -404,9 +404,14 @@ return methods; } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static T invokeMethod( Object target, Method method, Object... args ) { + if ( Modifier.isProtected( method.getModifiers() ) || Modifier.isPrivate( method.getModifiers() ) ) + { + return null; + } + try { return (T) method.invoke( target, args ); @@ -421,7 +426,7 @@ } } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) public static T getFieldObject( Field field, T target ) { return (T) invokeGetterMethod( field.getName(), target );