HADOOP-10549. MAX_SUBST and varPat should be final in Configuration.java. Contributed by Gera Shegalov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592011 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
bee448cacd
commit
73db6bdb9b
|
@ -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
|
||||
|
|
|
@ -797,14 +797,16 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
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++) {
|
||||
|
|
Loading…
Reference in New Issue