You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2019/09/16 14:57:55 UTC
[hadoop] branch trunk updated: HDDS-2078. Get/Renew DelegationToken
NPE after HDDS-1909
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 56f042c HDDS-2078. Get/Renew DelegationToken NPE after HDDS-1909
56f042c is described below
commit 56f042c48f15586eba6ca371e90253e57614ec8b
Author: Xiaoyu Yao <xy...@apache.org>
AuthorDate: Mon Sep 16 16:58:10 2019 +0200
HDDS-2078. Get/Renew DelegationToken NPE after HDDS-1909
Closes #1444
---
.../hadoop/ozone/om/request/security/OMGetDelegationTokenRequest.java | 4 ++--
.../ozone/om/request/security/OMRenewDelegationTokenRequest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMGetDelegationTokenRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMGetDelegationTokenRequest.java
index 77d16d5..be88b43 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMGetDelegationTokenRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMGetDelegationTokenRequest.java
@@ -147,8 +147,8 @@ public class OMGetDelegationTokenRequest extends OMClientRequest {
OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
try {
- OzoneTokenIdentifier ozoneTokenIdentifier =
- ozoneTokenIdentifierToken.decodeIdentifier();
+ OzoneTokenIdentifier ozoneTokenIdentifier = OzoneTokenIdentifier.
+ readProtoBuf(ozoneTokenIdentifierToken.getIdentifier());
// Update in memory map of token.
long renewTime = ozoneManager.getDelegationTokenMgr()
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java
index 49cc724..11c0c82 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java
@@ -123,8 +123,8 @@ public class OMRenewDelegationTokenRequest extends OMClientRequest {
.setSuccess(true);
try {
- OzoneTokenIdentifier ozoneTokenIdentifier =
- ozoneTokenIdentifierToken.decodeIdentifier();
+ OzoneTokenIdentifier ozoneTokenIdentifier = OzoneTokenIdentifier.
+ readProtoBuf(ozoneTokenIdentifierToken.getIdentifier());
// Update in memory map of token.
ozoneManager.getDelegationTokenMgr()
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org