logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattsic...@apache.org
Subject svn commit: r1609602 - /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
Date Fri, 11 Jul 2014 01:26:19 GMT
Author: mattsicker
Date: Fri Jul 11 01:26:18 2014
New Revision: 1609602

URL: http://svn.apache.org/r1609602
Log:
Catch Throwable here to handle VerifyError.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java?rev=1609602&r1=1609601&r2=1609602&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
Fri Jul 11 01:26:18 2014
@@ -74,7 +74,7 @@ public class Interpolator implements Str
         lookups.put("env", new EnvironmentLookup());
         try {
             lookups.put("jndi", new JndiLookup());
-        } catch (Exception e) {
+        } catch (Throwable e) {
             // [LOG4J2-703] We might be on Android
             // java.lang.VerifyError: org/apache/logging/log4j/core/lookup/JndiLookup
             LOGGER.warn(



Mime
View raw message