Handle nulls in getProperty(..) of CodeGenConfig. Fixes #9798

Author: graemerocher

grails-bootstrap/src/main/groovy/org/grails/config/CodeGenConfig.groovy

@@ -161,7 +161,7 @@ class CodeGenConfig implements Cloneable, ConfigMap {
     }
 
     protected <T> T convertToType(Object value, Class<T> requiredType) {
-        if(value instanceof NavigableMap.NullSafeNavigator) {
+        if(value == null || value instanceof NavigableMap.NullSafeNavigator) {
             return null
         }
         else if(requiredType.isInstance(value)) {

grails-bootstrap/src/test/groovy/grails/config/GrailsConfigSpec.groovy

@@ -16,7 +16,16 @@ class GrailsConfigSpec extends Specification{
         config.configMap.grails.profile == 'web'
         config.configMap.grails.containsKey('somekey') == true
     }
-    
+
+    def "Should support conversion from null to other objects"() {
+        given:
+        CodeGenConfig config = new CodeGenConfig()
+        config.put('foo.bar', null)
+
+        expect:
+        config.getProperty("foo.bar", Map.class) == null
+
+    }
     def "should support merging maps"() {
         given:
         CodeGenConfig config = new CodeGenConfig()