svn commit: r1629626 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java

[rmannibucau]

Author: rmannibucau
Date: Mon Oct  6 12:19:49 2014
New Revision: 1629626

URL: http://svn.apache.org/r1629626
Log:
avoid NPE

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1629626&r1=1629625&r2=1629626&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
 Mon Oct  6 12:19:49 2014
@@ -87,7 +87,10 @@ public class Logger {
         // without changing LogStreamFactory contract
         final String specialKey = "openejb.jul.forceReload";
         final String original = System.getProperty(specialKey);
-        System.setProperty(specialKey, config.getProperty(specialKey, 
SystemInstance.isInitialized() ? 
SystemInstance.get().getOptions().get(specialKey, (String) null) : null));
+        final String property = config.getProperty(specialKey, 
SystemInstance.isInitialized() ? 
SystemInstance.get().getOptions().get(specialKey, (String) null) : null);
+        if (property != null) {
+            System.setProperty(specialKey, property);
+        }
 
         try {
             if (factoryName != null) {