svn commit: r1365496 - /openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java

[rmannibucau]

Author: rmannibucau
Date: Wed Jul 25 09:04:34 2012
New Revision: 1365496

URL: http://svn.apache.org/viewvc?rev=1365496&view=rev
Log:
avoiding NPE

Modified:
    
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java

Modified: 
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1365496&r1=1365495&r2=1365496&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
 Wed Jul 25 09:04:34 2012
@@ -186,7 +186,9 @@ public class Container {
         properties.setProperty("openejb.home", catalinaBase);
         properties.setProperty("openejb.base", catalinaBase);
         properties.setProperty("openejb.servicemanager.enabled", "false");
-        properties.putAll(configuration.getProperties());
+        if (configuration.getProperties() != null) {
+            properties.putAll(configuration.getProperties());
+        }
 
         try {
             ClassLoader classLoader = 
Thread.currentThread().getContextClassLoader();