svn commit: r1351171 - /openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java

[rmannibucau]

Author: rmannibucau
Date: Sun Jun 17 21:57:12 2012
New Revision: 1351171

URL: http://svn.apache.org/viewvc?rev=1351171&view=rev
Log:
avoiding NPE when file is null

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

Modified: 
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java?rev=1351171&r1=1351170&r2=1351171&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
 Sun Jun 17 21:57:12 2012
@@ -71,9 +71,13 @@ public class Configuration {
     }
 
     public void setServerXml(String file) {
-        final File sXml = new File(file);
-        if (sXml.exists()) {
-            serverXml = sXml;
+        if (file == null) {
+            serverXml = null;
+        } else {
+            final File sXml = new File(file);
+            if (sXml.exists()) {
+                serverXml = sXml;
+            }
         }
     }