logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattsic...@apache.org
Subject svn commit: r1617640 - /logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
Date Wed, 13 Aug 2014 00:33:53 GMT
Author: mattsicker
Date: Wed Aug 13 00:33:52 2014
New Revision: 1617640

URL: http://svn.apache.org/r1617640
Log:
Fix bug where boolean value could never change.

  - Addresses potential problem where more than one resource in the war file matches the regexp
"^/WEB-INF/log4j2.*$".

Modified:
    logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java

Modified: logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java?rev=1617640&r1=1617639&r2=1617640&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
Wed Aug 13 00:33:52 2014
@@ -162,10 +162,11 @@ final class Log4jWebInitializerImpl exte
                     configLocation = paths[0];
                 } else if (paths.length > 1) {
                     final String prefix = "/WEB-INF/log4j2-" + this.name + ".";
-                    final boolean found = false;
+                    boolean found = false;
                     for (final String str : paths) {
                         if (str.startsWith(prefix)) {
                             configLocation = str;
+                            found = true;
                             break;
                         }
                     }



Mime
View raw message