marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

NTCP: Fix reported NPE in debug logging on java 16

Browse Source
This commit is contained in:
zzz
2021-05-10 08:42:04 -04:00
parent ea7183eeda
commit 121cb2c94c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
View File

@ -2,6 +2,7 @@ package net.i2p.router.transport.ntcp;
import java.io.Closeable;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Inet6Address;
import java.nio.ByteBuffer;
import java.nio.channels.SelectionKey;
@ -1759,9 +1760,16 @@ public class NTCPConnection implements Closeable {
@Override
public String toString() {
String fromIP;
if (_isInbound) {
InetAddress addr = _chan.socket().getInetAddress();
fromIP = addr != null ? addr.getHostAddress() : "unknown";
} else {
fromIP = null;
}
return "NTCP" + _version + " conn " +
_connID +
(_isInbound ? (" from " + _chan.socket().getInetAddress() + " port " + _chan.socket().getPort() + ' ')
(_isInbound ? (" from " + fromIP + " port " + _chan.socket().getPort() + ' ')
: (" to " + _remAddr.getHost() + " port " + _remAddr.getPort() + ' ')) +
(_remotePeer == null ? "unknown" : _remotePeer.calculateHash().toBase64().substring(0,6)) +
(isEstablished() ? "" : " not established") +