LDAP-300: Fix NPE for DefaultObjectDirectoryMapper in uber jar

spring-projects · May 21, 2014 · a154120 · a154120
1 parent ab88cab
commit a154120
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
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
@@ -75,8 +75,8 @@ public DefaultObjectDirectoryMapper() {
     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/...rc/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java b/...rc/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java
@@ -18,6 +18,7 @@
 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 void springVersionIsNull() {
         spy(SpringVersion.class);
         when(SpringVersion.getVersion()).thenReturn(null);
 
-        new DefaultObjectDirectoryMapper();
+        DefaultObjectDirectoryMapper mapper = new DefaultObjectDirectoryMapper();
+
+        // LDAP-300
+        assertNotNull(Whitebox.getInternalState(mapper,"converterManager"));
     }
 
     @Test