Repository: deltaspike Updated Branches: refs/heads/master 3ee1c98a9 -> 1d3dc077f
DELTASPIKE-679 NPE in BeanManagerProvider if parentClassLoader is null Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/1d3dc077 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/1d3dc077 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/1d3dc077 Branch: refs/heads/master Commit: 1d3dc077f7f9d3316a13e37448934c97c1bc2257 Parents: 3ee1c98 Author: Christian Kaltepoth <[email protected]> Authored: Thu Jul 31 08:10:26 2014 +0200 Committer: Christian Kaltepoth <[email protected]> Committed: Thu Jul 31 08:10:26 2014 +0200 ---------------------------------------------------------------------- .../apache/deltaspike/core/api/provider/BeanManagerProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1d3dc077/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java index cfa5907..3ff13fe 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java @@ -337,7 +337,7 @@ public class BeanManagerProvider implements Extension private BeanManagerInfo getParentBeanManagerInfo(ClassLoader classLoader) { ClassLoader parentClassLoader = classLoader.getParent(); - if (parentClassLoader.equals(ClassLoader.getSystemClassLoader())) + if (parentClassLoader == null || parentClassLoader.equals(ClassLoader.getSystemClassLoader())) { return null; }
