From 21c1b0cba42b1c40de6eee6340352347632c7579 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Thu, 1 May 2014 21:15:25 +0000 Subject: [PATCH] HADOOP-10562: Merging r1591782 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591783 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++ .../delegation/AbstractDelegationTokenSecretManager.java | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c0269d54fc1..096860ff5a8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -105,6 +105,10 @@ Release 2.5.0 - UNRELEASED HADOOP-10543. RemoteException's unwrapRemoteException method failed for PathIOException. (Yongjun Zhang via atm) + HADOOP-10562. Namenode exits on exception without printing stack trace + in AbstractDelegationTokenSecretManager. (Suresh Srinivas via Arpit + Agarwal) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java index d892c5d7f36..94ad23a52ec 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java @@ -560,8 +560,7 @@ extends AbstractDelegationTokenIdentifier> } } } catch (Throwable t) { - LOG.error("ExpiredTokenRemover thread received unexpected exception. " - + t); + LOG.error("ExpiredTokenRemover thread received unexpected exception", t); Runtime.getRuntime().exit(-1); } }