GRAILS-10134 fix

2013-09-20 11:56:12 -07:00
parent f6f0f1ec55
commit ac913bc652
1 changed files with 6 additions and 1 deletions
--- a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java
+++ b/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java
@@ -1820,7 +1820,12 @@ public class TypeRegistry {
 	}

 	public TypeRegistry getParentRegistry() {
-		return TypeRegistry.getTypeRegistryFor(classLoader.get().getParent());
+		ClassLoader cl = classLoader.get();
+		if (cl == null) { // GRAILS-10134
+			return null; 
+		} else {
+			return TypeRegistry.getTypeRegistryFor(cl.getParent());
+		}
 	}

 	public ReloadableType[] getReloadableTypes() {