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

LDAP-300: Fix NPE for DefaultObjectDirectoryMapper in uber jar

Browse Source
This commit is contained in:
Rob Winch
2014-05-21 07:52:48 -05:00
parent ab88cab98e
commit a1541208b9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,8 +75,8 @@ public class DefaultObjectDirectoryMapper implements ObjectDirectoryMapper {
private static ConverterManager createDefaultConverterManager() {
String springVersion = SpringVersion.getVersion();
if(springVersion == null) {
LOG.debug("Could not default convertManager, please ensure to explicitly set it");
return null;
LOG.debug("Could not determine the Spring Version. Guessing > Spring 3.0. If this does not work, please ensure to explicitly set converterManager");
return new ConversionServiceConverterManager();
} else if(springVersion.compareTo("3.0") > 0) {
return new ConversionServiceConverterManager();
} else {

6
core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java
View File

@@ -18,6 +18,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.matchers.JUnitMatchers;
import org.junit.runner.RunWith;
import org.mockito.internal.util.reflection.Whitebox;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.springframework.core.SpringVersion;
@@ -44,7 +45,10 @@ public class DefaultObjectDirectoryMapperTest {
spy(SpringVersion.class);
when(SpringVersion.getVersion()).thenReturn(null);
new DefaultObjectDirectoryMapper();
DefaultObjectDirectoryMapper mapper = new DefaultObjectDirectoryMapper();
// LDAP-300
assertNotNull(Whitebox.getInternalState(mapper,"converterManager"));
}
@Test