From fd297118f908373c54cef52ee128ef8716ebca45 Mon Sep 17 00:00:00 2001 From: zab2 Date: Sun, 11 Aug 2013 11:58:51 +0000 Subject: [PATCH] fix NPE if stats are not enabled --- .../i2p/client/streaming/ConnectionPacketHandler.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java index 62283ddc6..64e16cffa 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java @@ -5,6 +5,8 @@ import java.util.List; import net.i2p.I2PAppContext; import net.i2p.I2PException; import net.i2p.data.Destination; +import net.i2p.stat.FrequencyStat; +import net.i2p.stat.RateStat; import net.i2p.util.Log; import net.i2p.util.SimpleScheduler; import net.i2p.util.SimpleTimer; @@ -200,7 +202,9 @@ class ConnectionPacketHandler { if (_log.shouldLog(Log.DEBUG)) _log.debug("immediate ack"); con.ackImmediately(); - _context.statManager().getFrequency("stream.ack.dup.immediate").eventOccurred(); + FrequencyStat fs = _context.statManager().getFrequency("stream.ack.dup.immediate"); + if (fs != null) + fs.eventOccurred(); } else { final long delay = nextSendTime - now; if (_log.shouldLog(Log.DEBUG)) @@ -579,7 +583,9 @@ class ConnectionPacketHandler { if (_log.shouldLog(Log.DEBUG)) _log.debug("Ack dup on " + _con + ", but we have sent (" + (_con.getLastSendTime()-_created) + ")"); } - _context.statManager().getRate("stream.ack.dup.sent").addData(sent ? 1 : 0); + RateStat rs = _context.statManager().getRate("stream.ack.dup.sent"); + if (rs != null) + rs.addData(sent ? 1 : 0); } } }