svn commit: r1613814 - in /bval/branches/bval-11: bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java bval-tck11/src/main/java/org/apache/cxf/

[rmannibucau]

Author: rmannibucau
Date: Sun Jul 27 17:04:26 2014
New Revision: 1613814

URL: http://svn.apache.org/r1613814
Log:
avoid NPE if container is not initialized

Removed:
    bval/branches/bval-11/bval-tck11/src/main/java/org/apache/cxf/
Modified:
    
bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java

Modified: 
bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java
URL: 
http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java?rev=1613814&r1=1613813&r2=1613814&view=diff
==============================================================================
--- 
bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java
 (original)
+++ 
bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java
 Sun Jul 27 17:04:26 2014
@@ -223,7 +223,9 @@ public class BValExtension implements Ex
     }
 
     public void cleanupStoredBeanManagerOnShutdown(final @Observes 
BeforeShutdown beforeShutdown) {
-        bmpSingleton.bmInfos.remove(loader());
+        if (bmpSingleton.bmInfos != null) {
+            bmpSingleton.bmInfos.remove(loader());
+        }
     }
 
     private static BeanManager resolveBeanManagerViaJndi() {