svn commit: r1457341 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java

[rmannibucau]

Author: rmannibucau
Date: Sat Mar 16 23:21:32 2013
New Revision: 1457341

URL: http://svn.apache.org/r1457341
Log:
avoiding NPE

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1457341&r1=1457340&r2=1457341&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 Sat Mar 16 23:21:32 2013
@@ -488,9 +488,11 @@ public class ConfigurationFactory implem
                 final AppInfo appInfo = configureApplication(jarFile);
                 sys.containerSystem.applications.add(appInfo);
 
-            } catch (OpenEJBException alreadyHandled) {
+            } catch (final OpenEJBException alreadyHandled) {
                 final DeploymentExceptionManager exceptionManager = 
SystemInstance.get().getComponent(DeploymentExceptionManager.class);
-                exceptionManager.pushDelpoymentException(alreadyHandled);
+                if (exceptionManager != null) {
+                    exceptionManager.pushDelpoymentException(alreadyHandled);
+                }
             }
         }