big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-15294. TestUGILoginFromKeytab fails on Java9

Browse Source 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
Takanobu Asanuma 2018-03-14 13:38:07 +09:00 committed by Akira Ajisaka
parent e6de10d0a6
commit fea16a440d
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1885,10 +1885,13 @@ public void login() throws LoginException {
@Override @Override
public void logout() throws LoginException { public void logout() throws LoginException {
synchronized(getSubjectLock()) { synchronized(getSubjectLock()) {
if (this.getSubject() != null
&& !this.getSubject().getPrivateCredentials().isEmpty()) {
super.logout(); super.logout();
} }
} }
} }
}
/** /**
* A JAAS configuration that defines the login modules that we want * A JAAS configuration that defines the login modules that we want

2
hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
View File

@ -166,7 +166,7 @@ public void testKerberosLogin() throws Exception {
} finally { } finally {
if (loginContext != null && loginContext.getSubject() != null if (loginContext != null && loginContext.getSubject() != null
&& !loginContext.getSubject().getPrincipals().isEmpty()) { && !loginContext.getSubject().getPrivateCredentials().isEmpty()) {
loginContext.logout(); loginContext.logout();
} }
} }