[patch] 2013-06-04_tc6_55052.patch

2013-06-04_tc6_55052.patch (text/plain), 1.82 KB, created by Konstantin Kolinko on 2013-06-04 17:05:19 UTC

(hide)

Description: 2013-06-04_tc6_55052.patch

Filename:

MIME Type:

Creator: Konstantin Kolinko

Created: 2013-06-04 17:05:19 UTC

Size: 1.82 KB

patch

obsolete

>Index: java/org/apache/juli/ClassLoaderLogManager.java >=================================================================== >--- java/org/apache/juli/ClassLoaderLogManager.java (revision 1489499) >+++ java/org/apache/juli/ClassLoaderLogManager.java (working copy) >@@ -243,12 +243,31 @@ > * @param name The property name > */ > 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 >@@ -270,14 +289,9 @@ > result = super.getProperty(name); > } > } >- // Simple property replacement (mostly for folder names) >- if (result != null) { >- result = replace(result); >- } > return result; > } >- >- >+ > public void readConfiguration() > throws IOException, SecurityException { > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]