diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java index 8d1c7f6265d57..af1cec8ef1bc0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java @@ -169,7 +169,7 @@ public Peer peerSend(Peer peer, DataEncryptionKeyFactory encryptionKeyFactory, throws IOException { IOStreamPair ios = checkTrustAndSend(getPeerAddress(peer), peer.getOutputStream(), peer.getInputStream(), encryptionKeyFactory, - accessToken, datanodeId); + accessToken, datanodeId, null); // TODO: Consider renaming EncryptedPeer to SaslPeer. return ios != null ? new EncryptedPeer(peer, ios) : peer; } @@ -219,15 +219,6 @@ public IOStreamPair socketSend( * @return new pair of streams, wrapped after SASL negotiation * @throws IOException for any error */ - private IOStreamPair checkTrustAndSend(InetAddress addr, - OutputStream underlyingOut, InputStream underlyingIn, - DataEncryptionKeyFactory encryptionKeyFactory, - Token accessToken, DatanodeID datanodeId) - throws IOException { - return checkTrustAndSend(addr, underlyingOut, underlyingIn, - encryptionKeyFactory, accessToken, datanodeId, null); - } - private IOStreamPair checkTrustAndSend( InetAddress addr, OutputStream underlyingOut, InputStream underlyingIn, DataEncryptionKeyFactory encryptionKeyFactory,