Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix NPE in case of annotated field not having any attributes connected

Browse Source 
to it
This commit is contained in:
Konrad Windszus
2016-10-13 11:50:40 +02:00
committed by Rob Winch
parent 74c77276ec
commit c5ff90d1c5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
View File

@@ -117,7 +117,10 @@ public class DefaultObjectDirectoryMapper implements ObjectDirectoryMapper {
Set<String> managedAttributeNames = new HashSet<String>();
// extract all relevant attributes
for (Field field : entityData.metaData) {
managedAttributeNames.addAll(Arrays.asList(entityData.metaData.getAttribute(field).getAttributes()));
String[] attributesOfField = entityData.metaData.getAttribute(field).getAttributes();
if (attributesOfField != null && attributesOfField.length > 0) {
managedAttributeNames.addAll(Arrays.asList(attributesOfField));
}
}
return managedAttributeNames.toArray(new String[managedAttributeNames.size()]);
}