=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2015-03-06 06:57:45 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2015-03-06 06:58:52 +0000 @@ -41,6 +41,7 @@ import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.NameableObject; import org.springframework.core.Ordered; +import org.springframework.util.StringUtils; import java.lang.reflect.Method; import java.util.List; @@ -330,9 +331,14 @@ public Method getterByRole( String role ) { + if ( StringUtils.isEmpty( role ) ) + { + return null; + } + for ( Property property : propertyMap.values() ) { - if ( property.isCollection() && property.isManyToMany() && (property.getOwningRole().equals( role ) || property.getInverseRole().equals( role )) ) + if ( property.isCollection() && property.isManyToMany() && (role.equals( property.getOwningRole() ) || role.equals( property.getInverseRole() )) ) { return property.getGetterMethod(); } @@ -343,9 +349,14 @@ public Method setterByRole( String role ) { + if ( StringUtils.isEmpty( role ) ) + { + return null; + } + for ( Property property : propertyMap.values() ) { - if ( property.isCollection() && property.isManyToMany() && (property.getOwningRole().equals( role ) || property.getInverseRole().equals( role )) ) + if ( property.isCollection() && property.isManyToMany() && (role.equals( property.getOwningRole() ) || role.equals( property.getInverseRole() )) ) { return property.getSetterMethod(); }