From ab38e35bcd4af18d6f6e81c640b47b2eab771d17 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 8 Sep 2011 14:08:38 +0000 Subject: [PATCH] * NTCP: Hopefully fix race NPE, thx devzero --- router/java/src/net/i2p/router/transport/ntcp/Reader.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/router/java/src/net/i2p/router/transport/ntcp/Reader.java b/router/java/src/net/i2p/router/transport/ntcp/Reader.java index 9694815453..f98cf7d40a 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/Reader.java +++ b/router/java/src/net/i2p/router/transport/ntcp/Reader.java @@ -162,6 +162,9 @@ class Reader { if (est.isComplete() && est.getExtraBytes() != null) con.recvEncryptedI2NP(ByteBuffer.wrap(est.getExtraBytes())); } + // catch race? + if (!con.isEstablished()) + return; while (!con.isClosed() && (buf = con.getNextReadBuf()) != null) { // decrypt the data and push it into an i2np message if (_log.shouldLog(Log.DEBUG))