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

Posted to commits@karaf.apache.org by jb...@apache.org on 2011/05/10 19:55:00 UTC

svn commit: r1101564 - /karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/BootstrapLogManager.java

Author: jbonofre
Date: Tue May 10 17:55:00 2011
New Revision: 1101564

URL: http://svn.apache.org/viewvc?rev=1101564&view=rev
Log:
[KARAF-625] Missing property log4j.appender.out.file in file etc/org.ops4j.logging.cfg cause a NPE.

Modified:
    karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/BootstrapLogManager.java

Modified: karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/BootstrapLogManager.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/BootstrapLogManager.java?rev=1101564&r1=1101563&r2=1101564&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/BootstrapLogManager.java (original)
+++ karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/BootstrapLogManager.java Tue May 10 17:55:00 2011
@@ -65,6 +65,12 @@ public class BootstrapLogManager {
                     }
                 }
             }
+
+            if (props.getProperty("log4j.appender.out.file") == null) {
+                // manage if the log4j.appender.out.file property is not present in
+                // the etc/org.ops4j.pax.logging.cfg file
+                props.setProperty("log4j.appender.out.file", "${karaf.data}/log/karaf.log");
+            }
             filename = Main.substVars(props.getProperty("log4j.appender.out.file"),"log4j.appender.out.file", null, null);
             log = new File(filename);
         }