svn commit: r1611020 - in /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core: LoggerContext.java util/Environment.java

[rp...@apache.org]

Author: rpopma
Date: Wed Jul 16 14:21:31 2014
New Revision: 1611020

URL: http://svn.apache.org/r1611020
Log:
Changed solution for LOG4J2-716 (auto-disable JMX on Android): prefer catching/ignoring errors to depending on system properties

Removed:
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Environment.java
Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1611020&r1=1611019&r2=1611020&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java Wed Jul 16 14:21:31 2014
@@ -41,7 +41,6 @@ import org.apache.logging.log4j.core.con
 import org.apache.logging.log4j.core.config.Reconfigurable;
 import org.apache.logging.log4j.core.jmx.Server;
 import org.apache.logging.log4j.core.util.Assert;
-import org.apache.logging.log4j.core.util.Environment;
 import org.apache.logging.log4j.core.util.NetUtils;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.spi.AbstractLogger;
@@ -357,7 +356,7 @@ public class LoggerContext extends Abstr
         
         try { // LOG4J2-719 network access may throw android.os.NetworkOnMainThreadException
             map.putIfAbsent("hostName", NetUtils.getLocalHostname());
-        } catch (Exception ex) {
+        } catch (final Exception ex) {
             LOGGER.debug("Ignoring {}, setting hostName to 'unknown'", ex.toString());
             map.putIfAbsent("hostName", "unknown");
         }
@@ -372,12 +371,10 @@ public class LoggerContext extends Abstr
 
         firePropertyChangeEvent(new PropertyChangeEvent(this, PROPERTY_CONFIG, prev, config));
 
-        if (!Environment.isAndroid()) { // LOG4J2-716: Android has no java.lang.management
-            try {
-                Server.reregisterMBeansAfterReconfigure();
-            } catch (final Exception ex) {
-                LOGGER.error("Could not reconfigure JMX", ex);
-            }
+        try {
+            Server.reregisterMBeansAfterReconfigure();
+        } catch (final Throwable t) { // LOG4J2-716: Android has no java.lang.management
+            LOGGER.error("Could not reconfigure JMX", t);
         }
         return prev;
     }