YARN-5048. DelegationTokenRenewer#skipTokenRenewal may throw NPE (Jian He via Yongjun Zhang)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/47c41e7a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/47c41e7a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/47c41e7a Branch: refs/heads/HDFS-1312 Commit: 47c41e7ac7e6b905a58550f8899f629c1cf8b138 Parents: 6957e45 Author: Yongjun Zhang <[email protected]> Authored: Fri May 6 21:50:09 2016 -0700 Committer: Yongjun Zhang <[email protected]> Committed: Fri May 6 21:50:09 2016 -0700 ---------------------------------------------------------------------- .../resourcemanager/security/DelegationTokenRenewer.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/47c41e7a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java index cca14e9..fd12f11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java @@ -539,9 +539,14 @@ public class DelegationTokenRenewer extends AbstractService { */ private boolean skipTokenRenewal(Token<?> token) throws IOException { + @SuppressWarnings("unchecked") - Text renewer = ((Token<AbstractDelegationTokenIdentifier>)token). - decodeIdentifier().getRenewer(); + AbstractDelegationTokenIdentifier identifier = + ((Token<AbstractDelegationTokenIdentifier>) token).decodeIdentifier(); + if (identifier == null) { + return false; + } + Text renewer = identifier.getRenewer(); return (renewer != null && renewer.toString().equals("")); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
