Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2E9E10263 for ; Tue, 4 Jun 2013 12:19:53 +0000 (UTC) Received: (qmail 25784 invoked by uid 500); 4 Jun 2013 12:19:52 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 25668 invoked by uid 500); 4 Jun 2013 12:19:52 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 25648 invoked by uid 99); 4 Jun 2013 12:19:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 12:19:52 +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; Tue, 04 Jun 2013 12:19:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C27FC23888E4 for ; Tue, 4 Jun 2013 12:19:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489405 - /tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Date: Tue, 04 Jun 2013 12:19:29 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130604121929.C27FC23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Tue Jun 4 12:19:29 2013 New Revision: 1489405 URL: http://svn.apache.org/r1489405 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55052 Fall back to un-prefixed property if a prefixed one is not present Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1489405&r1=1489404&r2=1489405&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original) +++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Tue Jun 4 12:19:29 2013 @@ -244,12 +244,31 @@ public class ClassLoaderLogManager exten */ @Override public String getProperty(String name) { - ClassLoader classLoader = Thread.currentThread() - .getContextClassLoader(); String prefix = this.prefix.get(); + String result = null; + + // If a prefix is defined look for a prefixed property first if (prefix != null) { - name = prefix + name; + result = findProperty(prefix + name); + } + + // If there is no prefix or no property match with the prefix try just + // the name + if (result == null) { + result = findProperty(name); + } + + // Simple property replacement (mostly for folder names) + if (result != null) { + result = replace(result); } + return result; + } + + + private String findProperty(String name) { + ClassLoader classLoader = Thread.currentThread() + .getContextClassLoader(); ClassLoaderLogInfo info = getClassLoaderInfo(classLoader); String result = info.props.getProperty(name); // If the property was not found, and the current classloader had no @@ -271,14 +290,9 @@ public class ClassLoaderLogManager exten result = super.getProperty(name); } } - // Simple property replacement (mostly for folder names) - if (result != null) { - result = replace(result); - } return result; } - @Override public void readConfiguration() throws IOException, SecurityException { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org