From b182562c806fcd1c3d860e9ee4578afd2bf0a026 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 21 Apr 2020 17:01:03 +0000
Subject: [PATCH] Router: Fix logging NPE (thx zlatinb)
---
.../src/net/i2p/router/tunnel/InboundMessageDistributor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
index a8094f3cb3..ad39d4fda7 100644
--- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
+++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
@@ -266,7 +266,8 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
// ... and inject it.
((LeaseSet)dsm.getEntry()).setReceivedAsReply();
if (_log.shouldLog(Log.INFO))
- _log.info("Storing garlic LS down tunnel for: " + dsm.getKey() + " sent to: " + _client.toBase32());
+ _log.info("Storing garlic LS down tunnel for: " + dsm.getKey() + " sent to: " +
+ (_client != null ? _client.toBase32() : "router"));
_context.inNetMessagePool().add(dsm, null, null);
} else {
if (_client != null) {
--
GitLab