logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1580772 - /logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
Date Mon, 24 Mar 2014 06:31:56 GMT
Author: ggregory
Date: Mon Mar 24 06:31:55 2014
New Revision: 1580772

URL: http://svn.apache.org/r1580772
Log:
Don't hide name.

Modified:
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java

Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java?rev=1580772&r1=1580771&r2=1580772&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
Mon Mar 24 06:31:55 2014
@@ -210,32 +210,32 @@ public class LocalizedMessage implements
     /**
      * Override this to use a ResourceBundle.Control in Java 6
      * 
-     * @param baseName The base name of the resource bundle, a fully qualified class name.
+     * @param rbBaseName The base name of the resource bundle, a fully qualified class name.
      * @param resourceBundleLocale The locale to use when formatting the message.
      * @param loop If true the key will be treated as a package or class name and a resource
bundle will
      * be located based on all or part of the package name. If false the key is expected
to be the exact bundle id.
      * @return The ResourceBundle.
      */
-    protected ResourceBundle getResourceBundle(final String baseName, final Locale resourceBundleLocale,
final boolean loop) {
+    protected ResourceBundle getResourceBundle(final String rbBaseName, final Locale resourceBundleLocale,
final boolean loop) {
         ResourceBundle rb = null;
 
-        if (baseName == null) {
+        if (rbBaseName == null) {
             return null;
         }
         try {
             if (resourceBundleLocale != null) {
-                rb = ResourceBundle.getBundle(baseName, resourceBundleLocale);
+                rb = ResourceBundle.getBundle(rbBaseName, resourceBundleLocale);
             } else {
-                rb = ResourceBundle.getBundle(baseName);
+                rb = ResourceBundle.getBundle(rbBaseName);
             }
         } catch (final MissingResourceException ex) {
             if (!loop) {
-                logger.debug("Unable to locate ResourceBundle " + baseName);
+                logger.debug("Unable to locate ResourceBundle " + rbBaseName);
                 return null;
             }
         }
 
-        String substr = baseName;
+        String substr = rbBaseName;
         int i;
         while (rb == null && (i = substr.lastIndexOf('.')) > 0) {
             substr = substr.substring(0, i);



Mime
View raw message