Repository: hadoop Updated Branches: refs/heads/branch-2.8 fa695817e -> bdbf737ef
Addendum for HADOOP-14146. Use commons Base64 instead of jdk8 Base64. (cherry picked from commit 07193459091cfaf372634637096485154d39a176) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bdbf737e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bdbf737e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bdbf737e Branch: refs/heads/branch-2.8 Commit: bdbf737ef3575ffcafc44eccea88fc834137560f Parents: fa69581 Author: Kihwal Lee <[email protected]> Authored: Fri Jun 23 13:28:16 2017 -0500 Committer: Kihwal Lee <[email protected]> Committed: Fri Jun 23 13:28:16 2017 -0500 ---------------------------------------------------------------------- .../hadoop/security/authentication/util/TestKerberosUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdbf737e/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosUtil.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosUtil.java index 3a5ae28..d1d1ff3 100644 --- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosUtil.java +++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosUtil.java @@ -23,11 +23,11 @@ import java.io.IOException; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Base64; import java.util.List; import java.util.Locale; import java.util.regex.Pattern; +import org.apache.commons.codec.binary.Base64; import org.apache.directory.server.kerberos.shared.keytab.Keytab; import org.apache.directory.server.kerberos.shared.keytab.KeytabEntry; import org.apache.directory.shared.kerberos.KerberosTime; @@ -247,6 +247,6 @@ public class TestKerberosUtil { private static String getPrincipal(String token) { return KerberosUtil.getTokenServerName( - Base64.getDecoder().decode(token)); + Base64.decodeBase64(token)); } } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
