propagate from branch 'i2p.i2p.zzz.outproxy' (head 02da481346e0bf35b289f00b32f50871da202afb)

to branch 'i2p.i2p' (head eb2820957208e17c76e8c10a2c36e59e0da61895)
This commit is contained in:
zzz
2014-01-25 18:16:38 +00:00
163 changed files with 43375 additions and 33435 deletions

View File

@ -16,7 +16,7 @@ package net.i2p;
public class CoreVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = "0.9.9";
public final static String VERSION = "0.9.10";
public static void main(String args[]) {
System.out.println("I2P Core version: " + VERSION);

View File

@ -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;
}