svn merge -c 1346406. FIXES: MAPREDUCE-4313. TestTokenCache doesn't compile due TokenCache.getDelegationToken compilation error (bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346409 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-06-05 15:09:56 +00:00
parent 3f30678f76
commit eb7df250ca
2 changed files with 4 additions and 1 deletions

View File

@ -42,6 +42,9 @@ Release 2.0.1-alpha - UNRELEASED
MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize() MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize()
without a Path - Failure when using ViewFileSystem. (Ahmed Radwan via eli) without a Path - Failure when using ViewFileSystem. (Ahmed Radwan via eli)
MAPREDUCE-4313. TestTokenCache doesn't compile due
TokenCache.getDelegationToken compilation error (bobby)
Release 2.0.0-alpha - 05-23-2012 Release 2.0.0-alpha - 05-23-2012
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -288,7 +288,7 @@ public class TestTokenCache {
// this token is keyed by hostname:port key. // this token is keyed by hostname:port key.
String fs_addr = String fs_addr =
SecurityUtil.buildDTServiceName(p1.toUri(), NameNode.DEFAULT_PORT); SecurityUtil.buildDTServiceName(p1.toUri(), NameNode.DEFAULT_PORT);
Token<DelegationTokenIdentifier> nnt = TokenCache.getDelegationToken( Token<DelegationTokenIdentifier> nnt = (Token<DelegationTokenIdentifier>)TokenCache.getDelegationToken(
credentials, fs_addr); credentials, fs_addr);
System.out.println("dt for " + p1 + "(" + fs_addr + ")" + " = " + nnt); System.out.println("dt for " + p1 + "(" + fs_addr + ")" + " = " + nnt);
assertNotNull("Token for nn is null", nnt); assertNotNull("Token for nn is null", nnt);