propagate from branch 'i2p.i2p.zzz.test2' (head 9aee013cf961ba795a6b5333481634c52d43abc5)

to branch 'i2p.i2p' (head e439e67c49695a624fabdf6f3cd1a8f7a3fd7ea5)
2014-05-29 12:31:49 +00:00
parent 6ae86f7d81 af5c0bd8a7
commit 7c79f5d5e5
81 changed files with 19830 additions and 8158 deletions
--- a/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java
@ -1558,6 +1558,8 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
        // TODO throttle
        try {
            byte[] payload = session.receiveMessage(msgId);
+            if (payload == null)
+                return;
            _rxPkts.incrementAndGet();
            _rxBytes.addAndGet(payload.length);
            if (toPort == _qPort) {