From bae376e0026b4c0263d6bcb7071c6229d5ebc549 Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Mon, 31 Mar 2014 18:42:11 +0000 Subject: [PATCH] HADOOP-10451. Merge r1583393 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583395 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/security/SaslRpcServer.java | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 462b5d7c5ae..6d013517dec 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -8,6 +8,9 @@ Release 2.5.0 - UNRELEASED IMPROVEMENTS + HADOOP-10451. Remove unused field and imports from SaslRpcServer. + (Benoy Antony via jing9) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java index 8240fdeedef..83f46efd6e4 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java @@ -30,7 +30,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.TreeMap; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -66,8 +65,6 @@ import org.apache.hadoop.security.token.TokenIdentifier; public class SaslRpcServer { public static final Log LOG = LogFactory.getLog(SaslRpcServer.class); public static final String SASL_DEFAULT_REALM = "default"; - public static final Map SASL_PROPS = - new TreeMap(); private static SaslServerFactory saslFactory; public static enum QualityOfProtection {