Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9253311C19 for ; Wed, 13 Aug 2014 00:34:16 +0000 (UTC) Received: (qmail 49099 invoked by uid 500); 13 Aug 2014 00:34:16 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 49069 invoked by uid 500); 13 Aug 2014 00:34:16 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 49060 invoked by uid 99); 13 Aug 2014 00:34:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Aug 2014 00:34:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Aug 2014 00:33:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4D1BB2388C54; Wed, 13 Aug 2014 00:33:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@logging.apache.org From: mattsicker@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140813003353.4D1BB2388C54@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; } }