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

HADOOP-9844. NPE when trying to create an error message response of SASL RPC 

This closes #55

Change-Id: I10a20380565fa89762f4aa564b2f1c83b9aeecdc
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 07530314c2)
This commit is contained in:
Steve Loughran 2017-10-13 13:31:01 +01:00 committed by Akira Ajisaka
parent 3bfae20e94
commit c0fd09c42c
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/IpcException.java
View File

@ -26,9 +26,8 @@ import java.io.IOException;
*/ */
public class IpcException extends IOException { public class IpcException extends IOException {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
final String errMsg;
public IpcException(final String err) { public IpcException(final String err) {
errMsg = err; super(err);
} }
} }

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
View File

@ -1948,7 +1948,7 @@ public abstract class Server {
private void doSaslReply(Exception ioe) throws IOException { private void doSaslReply(Exception ioe) throws IOException {
setupResponse(authFailedCall, setupResponse(authFailedCall,
RpcStatusProto.FATAL, RpcErrorCodeProto.FATAL_UNAUTHORIZED, RpcStatusProto.FATAL, RpcErrorCodeProto.FATAL_UNAUTHORIZED,
null, ioe.getClass().getName(), ioe.getLocalizedMessage()); null, ioe.getClass().getName(), ioe.toString());
sendResponse(authFailedCall); sendResponse(authFailedCall);
} }
@ -2307,7 +2307,8 @@ public abstract class Server {
final RpcCall call = new RpcCall(this, callId, retry); final RpcCall call = new RpcCall(this, callId, retry);
setupResponse(call, setupResponse(call,
rse.getRpcStatusProto(), rse.getRpcErrorCodeProto(), null, rse.getRpcStatusProto(), rse.getRpcErrorCodeProto(), null,
t.getClass().getName(), t.getMessage()); t.getClass().getName(),
t.getMessage() != null ? t.getMessage() : t.toString());
sendResponse(call); sendResponse(call);
} }
} }