From 0c5811801faa4a6fe0a49a13d4de9c68f5095300 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 5 Dec 2012 00:01:49 +0000
Subject: [PATCH] * SSU: Fix rare NPE (ticket #798)
---
router/java/src/net/i2p/router/transport/udp/UDPTransport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index 366095d931..07c6a4fbd3 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -879,7 +879,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
_log.warn(remotePeer + " changed address FROM " + oldID + " TO " + remoteId);
PeerState oldPeer2 = _peersByRemoteHost.remove(oldID);
// different ones in the two maps? shouldn't happen
- if (oldPeer2 != oldPeer) {
+ if (oldPeer2 != oldPeer && oldPeer2 != null) {
oldPeer2.dropOutbound();
_introManager.remove(oldPeer2);
_expireEvent.remove(oldPeer2);
--
GitLab