Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jing Zhao 2014-03-31 18:42:11 +00:00
parent 0cd6f12410
commit bae376e002
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -8,6 +8,9 @@ Release 2.5.0 - UNRELEASED
IMPROVEMENTS IMPROVEMENTS
HADOOP-10451. Remove unused field and imports from SaslRpcServer.
(Benoy Antony via jing9)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java
View File

@ -30,7 +30,6 @@ import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeMap;
import javax.security.auth.callback.Callback; import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.CallbackHandler;
@ -66,8 +65,6 @@ import org.apache.hadoop.security.token.TokenIdentifier;
public class SaslRpcServer { public class SaslRpcServer {
public static final Log LOG = LogFactory.getLog(SaslRpcServer.class); public static final Log LOG = LogFactory.getLog(SaslRpcServer.class);
public static final String SASL_DEFAULT_REALM = "default"; public static final String SASL_DEFAULT_REALM = "default";
public static final Map<String, String> SASL_PROPS =
new TreeMap<String, String>();
private static SaslServerFactory saslFactory; private static SaslServerFactory saslFactory;
public static enum QualityOfProtection { public static enum QualityOfProtection {