From ac913bc652c5e33b7e7ad06faea30c022016cd26 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Fri, 20 Sep 2013 11:56:12 -0700 Subject: [PATCH] GRAILS-10134 fix --- .../main/java/org/springsource/loaded/TypeRegistry.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java b/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java index 08fce21..53a2b87 100644 --- 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() {