=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2014-07-14 05:03:38 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2014-07-27 13:15:50 +0000 @@ -252,9 +252,11 @@ private Expression extractExpression( T object, String fieldName ) { + Expression expression = null; + if ( ReflectionUtils.findGetterMethod( fieldName, object ) != null ) { - Object expression = ReflectionUtils.invokeGetterMethod( fieldName, object ); + expression = ReflectionUtils.invokeGetterMethod( fieldName, object ); if ( expression != null && Expression.class.isAssignableFrom( expression.getClass() ) ) { @@ -262,7 +264,7 @@ } } - return null; + return expression; } private Set extractDataElementOperands( T object, String fieldName )