Author: cnauroth
Date: Fri May 2 19:08:38 2014
New Revision: 1592011
URL: http://svn.apache.org/r1592011
Log:
HADOOP-10549. MAX_SUBST and varPat should be final in Configuration.java.
Contributed by Gera Shegalov.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1592011&r1=1592010&r2=1592011&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri May
2 19:08:38 2014
@@ -361,6 +361,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10322. Add ability to read principal names from a keytab.
(Benoy Antony and Daryn Sharp via kihwal)
+ HADOOP-10549. MAX_SUBST and varPat should be final in Configuration.java.
+ (Gera Shegalov via cnauroth)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1592011&r1=1592010&r2=1592011&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Fri May 2 19:08:38 2014
@@ -797,14 +797,16 @@ public class Configuration implements It
reloadConfiguration();
}
- private static Pattern varPat = Pattern.compile("\\$\\{[^\\}\\$\u0020]+\\}");
- private static int MAX_SUBST = 20;
+ private static final Pattern VAR_PATTERN =
+ Pattern.compile("\\$\\{[^\\}\\$\u0020]+\\}");
+
+ private static final int MAX_SUBST = 20;
private String substituteVars(String expr) {
if (expr == null) {
return null;
}
- Matcher match = varPat.matcher("");
+ Matcher match = VAR_PATTERN.matcher("");
String eval = expr;
Set<String> evalSet = new HashSet<String>();
for(int s=0; s<MAX_SUBST; s++) {
