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

HADOOP-8418. Update UGI Principal classes name for running with 

IBM JDK on 64 bits Windows.  (Yu Gao via eyang)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1418572 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Yang 2012-12-08 00:48:04 +00:00
parent e7cb3fd39c
commit bcaba93941
2 changed files with 17 additions and 10 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

@ -143,6 +143,9 @@ Trunk (Unreleased)
BUG FIXES BUG FIXES
HADOOP-8418. Update UGI Principal classes name for running with
IBM JDK on 64 bits Windows. (Yu Gao via eyang)
HADOOP-8177. MBeans shouldn't try to register when it fails to create MBeanName. HADOOP-8177. MBeans shouldn't try to register when it fails to create MBeanName.
(Devaraj K via umamahesh) (Devaraj K via umamahesh)

22
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
View File

@ -300,12 +300,16 @@ public class UserGroupInformation {
private static String OS_LOGIN_MODULE_NAME; private static String OS_LOGIN_MODULE_NAME;
private static Class<? extends Principal> OS_PRINCIPAL_CLASS; private static Class<? extends Principal> OS_PRINCIPAL_CLASS;
private static final boolean windows = private static final boolean windows =
System.getProperty("os.name").startsWith("Windows"); System.getProperty("os.name").startsWith("Windows");
private static final boolean is64Bit =
System.getProperty("os.arch").contains("64");
/* Return the OS login module class name */ /* Return the OS login module class name */
private static String getOSLoginModuleName() { private static String getOSLoginModuleName() {
if (System.getProperty("java.vendor").contains("IBM")) { if (System.getProperty("java.vendor").contains("IBM")) {
return windows ? "com.ibm.security.auth.module.NTLoginModule" return windows ? (is64Bit
: "com.ibm.security.auth.module.LinuxLoginModule"; ? "com.ibm.security.auth.module.Win64LoginModule"
: "com.ibm.security.auth.module.NTLoginModule")
: "com.ibm.security.auth.module.LinuxLoginModule";
} else { } else {
return windows ? "com.sun.security.auth.module.NTLoginModule" return windows ? "com.sun.security.auth.module.NTLoginModule"
: "com.sun.security.auth.module.UnixLoginModule"; : "com.sun.security.auth.module.UnixLoginModule";
@ -319,13 +323,13 @@ public class UserGroupInformation {
try { try {
if (System.getProperty("java.vendor").contains("IBM")) { if (System.getProperty("java.vendor").contains("IBM")) {
if (windows) { if (windows) {
return (Class<? extends Principal>) return (Class<? extends Principal>) (is64Bit
cl.loadClass("com.ibm.security.auth.UsernamePrincipal"); ? cl.loadClass("com.ibm.security.auth.UsernamePrincipal")
: cl.loadClass("com.ibm.security.auth.NTUserPrincipal"));
} else { } else {
return (Class<? extends Principal>) return (Class<? extends Principal>) (is64Bit
(System.getProperty("os.arch").contains("64") ? cl.loadClass("com.ibm.security.auth.UsernamePrincipal")
? cl.loadClass("com.ibm.security.auth.UsernamePrincipal") : cl.loadClass("com.ibm.security.auth.LinuxPrincipal"));
: cl.loadClass("com.ibm.security.auth.LinuxPrincipal"));
} }
} else { } else {
return (Class<? extends Principal>) (windows return (Class<? extends Principal>) (windows