You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/10/06 18:26:46 UTC
svn commit: r1629702 -
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
Author: rmannibucau
Date: Mon Oct 6 16:26:45 2014
New Revision: 1629702
URL: http://svn.apache.org/r1629702
Log:
reducing potential locks
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=1629702&r1=1629701&r2=1629702&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 Mon Oct 6 16:26:45 2014
@@ -53,7 +53,6 @@ public class JuliLogStreamFactory implem
final Options options = SystemInstance.get().getOptions();
final boolean forceLogs = options.get("openejb.jul.forceReload", false);
if ((!tomee || embedded || forceLogs) && System.getProperty("java.util.logging.manager") == null) {
- System.setProperty("java.util.logging.manager", OpenEJBLogManager.class.getName());
if (options.get(OPENEJB_LOG_COLOR_PROP, false) && isNotIDE()) {
consoleHandlerClazz = org.apache.openejb.log.ConsoleColorHandler.class.getName();
} else {
@@ -93,6 +92,8 @@ public class JuliLogStreamFactory implem
// no-op
}
}
+ // do it last since otherwise it can lock
+ System.setProperty("java.util.logging.manager", OpenEJBLogManager.class.getName());
}
try {