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

HDFS-13730. BlockReaderRemote.sendReadResult throws NPE. Contributed by Yuanbo Liu. 

(cherry picked from commit 62ad9885ea)
This commit is contained in:
Wei-Chiu Chuang 2019-06-17 20:18:53 -07:00
parent f68099aa13
commit 45543ffd6a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/net/BasicInetPeer.java
View File

@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.Socket; import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.ReadableByteChannel; import java.nio.channels.ReadableByteChannel;
import org.apache.hadoop.net.unix.DomainSocket; import org.apache.hadoop.net.unix.DomainSocket;
@ -93,7 +94,8 @@ public class BasicInetPeer implements Peer {
@Override @Override
public String getRemoteAddressString() { public String getRemoteAddressString() {
return socket.getRemoteSocketAddress().toString(); SocketAddress address = socket.getRemoteSocketAddress();
return address == null ? null : address.toString();
} }
@Override @Override

4
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/net/NioInetPeer.java
View File

@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.Socket; import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.ReadableByteChannel; import java.nio.channels.ReadableByteChannel;
import org.apache.hadoop.net.SocketInputStream; import org.apache.hadoop.net.SocketInputStream;
@ -96,7 +97,8 @@ public class NioInetPeer implements Peer {
@Override @Override
public String getRemoteAddressString() { public String getRemoteAddressString() {
return socket.getRemoteSocketAddress().toString(); SocketAddress address = socket.getRemoteSocketAddress();
return address == null ? null : address.toString();
} }
@Override @Override