You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by rm...@apache.org on 2012/10/22 12:26:57 UTC

svn commit: r1400832 - /openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

Author: rmannibucau
Date: Mon Oct 22 10:26:57 2012
New Revision: 1400832

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

Modified:
    openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

Modified: openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=1400832&r1=1400831&r2=1400832&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java Mon Oct 22 10:26:57 2012
@@ -282,7 +282,9 @@ public abstract class ServiceManager {
                 if (EnvProps.extractConfigurationFiles()) {
 
                     final String rawPropsContent = (String) props.get(Properties.class);
-                    IO.copy(IO.read(rawPropsContent), serviceConfig);
+                    if (rawPropsContent != null) {
+                        IO.copy(IO.read(rawPropsContent), serviceConfig);
+                    }
 
                 } else {
                     props.put("disabled", "true");