Author: rahul
Date: Fri Dec 1 13:27:54 2006
New Revision: 481403
URL: http://svn.apache.org/viewvc?view=rev&rev=481403
Log:
Need to refresh the TCCL, rather than assigning it to a field (as appears to be
the *intent*).
SHALE-320
Modified:
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/util/Messages.java
Modified:
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/util/Messages.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/src/main/java/org/apache/shale/util/Messages.java?view=diff&rev=481403&r1=481402&r2=481403
==============================================================================
---
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/util/Messages.java
(original)
+++
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/util/Messages.java
Fri Dec 1 13:27:54 2006
@@ -284,16 +284,16 @@
assert locale != null;
ResourceBundle rb = null;
ClassLoader rbcl = cl;
- if (cl == null) {
- cl = Thread.currentThread().getContextClassLoader();
+ if (rbcl == null) {
+ rbcl = Thread.currentThread().getContextClassLoader();
}
synchronized (bundles) {
rb = (ResourceBundle) bundles.get(locale);
if (rb == null) {
try {
- rb = ResourceBundle.getBundle(name, locale, cl);
+ rb = ResourceBundle.getBundle(name, locale, rbcl);
} catch (MissingResourceException e) {
- rb = ResourceBundle.getBundle(name, defaultLocale, cl);
+ rb = ResourceBundle.getBundle(name, defaultLocale, rbcl);
}
if (rb == null) {
if (log().isWarnEnabled()) {
