From 3cef4b5cecae391cce57287fa11e0e67c64b1a1c Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Fri, 7 Apr 2006 18:52:24 +0000 Subject: [PATCH] Prevent NPE when we process a pong that was destined for a different DeltaCalculator. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4003 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/client/DeltaCalculator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/java/com/threerings/presents/client/DeltaCalculator.java b/src/java/com/threerings/presents/client/DeltaCalculator.java index 730ea4183..19fdb09d0 100644 --- a/src/java/com/threerings/presents/client/DeltaCalculator.java +++ b/src/java/com/threerings/presents/client/DeltaCalculator.java @@ -69,6 +69,11 @@ public class DeltaCalculator */ public boolean gotPong (PongResponse pong) { + if (_ping == null) { + // an errant pong that is likely being processed late after + // a new connection was opened. + return false; + } // don't freak out if they keep calling gotPong() after we're done if (_iter >= _deltas.length) { return true;