deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject git commit: DELTASPIKE-363 prevent NPE at shutdown
Date Sat, 11 May 2013 10:49:26 GMT
Updated Branches:
  refs/heads/master b43b71208 -> 709fdb7cd


DELTASPIKE-363 prevent NPE at shutdown


Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/709fdb7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/709fdb7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/709fdb7c

Branch: refs/heads/master
Commit: 709fdb7cd7fc20abd151b1a92a7c9021553e5924
Parents: b43b712
Author: Mark Struberg <struberg@apache.org>
Authored: Sat May 11 12:49:08 2013 +0200
Committer: Mark Struberg <struberg@apache.org>
Committed: Sat May 11 12:49:08 2013 +0200

----------------------------------------------------------------------
 .../core/api/provider/BeanManagerProvider.java     |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/709fdb7c/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 1430ac8..5cb361f 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
@@ -234,6 +234,12 @@ public class BeanManagerProvider implements Extension
      */
     public void cleanupStoredBeanManagerOnShutdown(@Observes BeforeShutdown beforeShutdown)
     {
+        if (bmpSingleton == null)
+        {
+            // this happens if there has been a failure at startup
+            return;
+        }
+
         ClassLoader classLoader = ClassUtils.getClassLoader(null);
         bmpSingleton.bmInfos.remove(classLoader);
 


Mime
View raw message