You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2013/08/22 17:37:13 UTC
svn commit: r1516488 -
/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java
Author: ggregory
Date: Thu Aug 22 15:37:13 2013
New Revision: 1516488
URL: http://svn.apache.org/r1516488
Log:
Better lvar name.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java?rev=1516488&r1=1516487&r2=1516488&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java Thu Aug 22 15:37:13 2013
@@ -154,25 +154,25 @@ public final class OptionConverter {
return defaultValue;
}
- String s = value.trim().toUpperCase(Locale.ENGLISH);
+ String str = value.trim().toUpperCase(Locale.ENGLISH);
long multiplier = 1;
int index;
- if ((index = s.indexOf("KB")) != -1) {
+ if ((index = str.indexOf("KB")) != -1) {
multiplier = ONE_K;
- s = s.substring(0, index);
- } else if ((index = s.indexOf("MB")) != -1) {
+ str = str.substring(0, index);
+ } else if ((index = str.indexOf("MB")) != -1) {
multiplier = ONE_K * ONE_K;
- s = s.substring(0, index);
- } else if ((index = s.indexOf("GB")) != -1) {
+ str = str.substring(0, index);
+ } else if ((index = str.indexOf("GB")) != -1) {
multiplier = ONE_K * ONE_K * ONE_K;
- s = s.substring(0, index);
+ str = str.substring(0, index);
}
- if (s != null) {
+ if (str != null) {
try {
- return Long.valueOf(s) * multiplier;
+ return Long.valueOf(str) * multiplier;
} catch (final NumberFormatException e) {
- LOGGER.error("[" + s + "] is not in proper int form.");
+ LOGGER.error("[" + str + "] is not in proper int form.");
LOGGER.error("[" + value + "] not in expected format.", e);
}
}