diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java index 7a518650..a3d4c467 100644 --- a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java +++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java @@ -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 { diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java index 26363745..6914c92a 100644 --- a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java +++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java @@ -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