From 80fadb45803dec57b3a4c86c1d1bb78b2fe11390 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 9 Jan 2014 12:27:18 +0000
Subject: [PATCH] Kad: Fix NPE when removing yourself

---
 core/java/src/net/i2p/kademlia/KBucketSet.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/src/net/i2p/kademlia/KBucketSet.java b/core/java/src/net/i2p/kademlia/KBucketSet.java
index 1b2ba756a..e19d2e50a 100644
--- a/core/java/src/net/i2p/kademlia/KBucketSet.java
+++ b/core/java/src/net/i2p/kademlia/KBucketSet.java
@@ -276,6 +276,8 @@ public class KBucketSet<T extends SimpleDataStructure> {
         try {
             kbucket = getBucket(entry);
         } finally { releaseReadLock(); }
+        if (kbucket == null)  // us
+            return false;
         boolean removed = kbucket.remove(entry);
         return removed;
     }