Author: rmannibucau Date: Tue Oct 7 10:17:08 2014 New Revision: 1629850 URL: http://svn.apache.org/r1629850 Log: TOMEE-1385 allow to change consoleHandlerClazz - ensure to not triger SystemInstance when not relevant
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1629850&r1=1629849&r2=1629850&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Tue Oct 7 10:17:08 2014 @@ -51,10 +51,10 @@ public class JuliLogStreamFactory implem final boolean embedded = is("org.apache.tomee.embedded.Container"); // if embedded case enhance a bit logging if not set - final Options options = SystemInstance.get().getOptions(); + final Options options = SystemInstance.isInitialized() ? SystemInstance.get().getOptions() : new Options(System.getProperties()); final boolean forceLogs = options.get("openejb.jul.forceReload", false); if ((!tomee || embedded || forceLogs) && System.getProperty("java.util.logging.manager") == null) { - consoleHandlerClazz = System.getProperty("openejb.jul.consoleHandlerClazz"); + consoleHandlerClazz = options.get("openejb.jul.consoleHandlerClazz", (String) null); if (consoleHandlerClazz == null) { if (options.get(OPENEJB_LOG_COLOR_PROP, false) && isNotIDE()) { consoleHandlerClazz = ConsoleColorHandler.class.getName();