openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1811171 - /openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
Date Thu, 05 Oct 2017 08:46:38 GMT
Author: rmannibucau
Date: Thu Oct  5 08:46:38 2017
New Revision: 1811171

URL: http://svn.apache.org/viewvc?rev=1811171&view=rev
Log:
MEECROWAVE-68 set the log manager before any action triggering logger loading

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java?rev=1811171&r1=1811170&r2=1811171&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
Thu Oct  5 08:46:38 2017
@@ -378,6 +378,10 @@ public class Meecrowave implements AutoC
             configuration.loadFrom(configuration.getMeecrowaveProperties());
         }
 
+        if (configuration.isUseLog4j2JulLogManager()) { // /!\ don't move this line or add
anything before without checking log setup
+            System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
+        }
+
         if (configuration.loggingGlobalSetup) {
 
             setSystemProperty(systemPropsToRestore, "log4j.shutdownHookEnabled", "false");
@@ -401,9 +405,6 @@ public class Meecrowave implements AutoC
         setupJmx(configuration.isTomcatNoJmx());
 
         clearCatalinaSystemProperties = System.getProperty("catalina.base") == null &&
System.getProperty("catalina.home") == null;
-        if (configuration.isUseLog4j2JulLogManager()) {
-            System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
-        }
 
         if (configuration.quickSession) {
             tomcat = new TomcatWithFastSessionIDs();



Mime
View raw message