svn commit: r1042904 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java

[tveronezi]

Author: tveronezi
Date: Tue Dec  7 03:37:22 2010
New Revision: 1042904

URL: http://svn.apache.org/viewvc?rev=1042904&view=rev
Log:
avoid NullPointerException

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1042904&r1=1042903&r2=1042904&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
 Tue Dec  7 03:37:22 2010
@@ -153,14 +153,14 @@ public class Log4jLogStreamFactory imple
 
     private void configureEmbedded() {
         URL resource = ConfUtils.getResource(EMBEDDED_PROPERTIES_FILE);
-        Properties properties = asProperies(resource);
-
-        applyOverrides(properties);
+        if (resource == null) {
+               System.out.println("FATAL ERROR WHILE CONFIGURING LOGGING!!!. 
MISSING embedded.logging.properties FILE ");
 
-        if (resource != null) {
-            PropertyConfigurator.configure(properties);
         } else {
-            System.out.println("FATAL ERROR WHILE CONFIGURING LOGGING!!!. 
MISSING embedded.logging.properties FILE ");
+            Properties properties = asProperies(resource);
+            applyOverrides(properties);
+            PropertyConfigurator.configure(properties);
+
         }
     }