hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aengin...@apache.org
Subject [28/50] [abbrv] hadoop git commit: HADOOP-12567. NPE in SaslRpcServer. Contributed by Sergey Shelukhin.
Date Sat, 21 Nov 2015 07:56:32 GMT
HADOOP-12567. NPE in SaslRpcServer. Contributed by Sergey Shelukhin.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7fab5c8c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7fab5c8c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7fab5c8c

Branch: refs/heads/HDFS-7240
Commit: 7fab5c8cec0d2ab62acf50b7c33351fb69c8c187
Parents: 6a61928
Author: cnauroth <cnauroth@apache.org>
Authored: Tue Nov 17 15:59:57 2015 -0800
Committer: cnauroth <cnauroth@apache.org>
Committed: Tue Nov 17 15:59:57 2015 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                 | 2 ++
 .../src/main/java/org/apache/hadoop/security/SaslRpcServer.java | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7fab5c8c/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 796292c..bb6d124 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1326,6 +1326,8 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12560: Fix sprintf warnings in {{DomainSocket.c}} introduced by
     HADOOP-12344 (Mingliang Liu via Colin P. McCabe)
 
+    HADOOP-12567: NPE in SaslRpcServer (Sergey Shelukhin via cnauroth)
+
   OPTIMIZATIONS
 
     HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7fab5c8c/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java
----------------------------------------------------------------------
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 f2b21e8..50acc5c 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
@@ -322,8 +322,9 @@ public class SaslRpcServer {
         }
         if (ac.isAuthorized()) {
           if (LOG.isDebugEnabled()) {
-            String username =
-              getIdentifier(authzid, secretManager).getUser().getUserName();
+            UserGroupInformation logUser =
+              getIdentifier(authzid, secretManager).getUser();
+            String username = logUser == null ? null : logUser.getUserName();
             LOG.debug("SASL server DIGEST-MD5 callback: setting "
                 + "canonicalized client ID: " + username);
           }


Mime
View raw message