Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-8917. Merge 1450571 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450572 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-02-27 01:39:01 +00:00
parent 6485664b15
commit d0e1c8656e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -55,6 +55,9 @@ Release 2.0.4-beta - UNRELEASED
HADOOP-7487. DF should throw a more reasonable exception when mount cannot HADOOP-7487. DF should throw a more reasonable exception when mount cannot
be determined. (Andrew Wang via atm) be determined. (Andrew Wang via atm)
HADOOP-8917. add LOCALE.US to toLowerCase in SecurityUtil.replacePattern.
(Arpit Agarwal via suresh)
Release 2.0.3-alpha - 2013-02-06 Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
View File

@ -30,6 +30,7 @@
import java.security.PrivilegedExceptionAction; import java.security.PrivilegedExceptionAction;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import java.util.Set; import java.util.Set;
@ -219,7 +220,7 @@ private static String replacePattern(String[] components, String hostname)
if (fqdn == null || fqdn.equals("") || fqdn.equals("0.0.0.0")) { if (fqdn == null || fqdn.equals("") || fqdn.equals("0.0.0.0")) {
fqdn = getLocalHostName(); fqdn = getLocalHostName();
} }
return components[0] + "/" + fqdn.toLowerCase() + "@" + components[2]; return components[0] + "/" + fqdn.toLowerCase(Locale.US) + "@" + components[2];
} }
static String getLocalHostName() throws UnknownHostException { static String getLocalHostName() throws UnknownHostException {