From dd15495810445d0c6ee07e30ecf05f873e5bbd2d Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 28 Sep 2009 21:51:08 +0000 Subject: [PATCH] Avoid NPE for final datagrams sent/received after client cleanup. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5975 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/presents/client/BlockingCommunicator.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/presents/client/BlockingCommunicator.java b/src/java/com/threerings/presents/client/BlockingCommunicator.java index a7da66e72..e842318f2 100644 --- a/src/java/com/threerings/presents/client/BlockingCommunicator.java +++ b/src/java/com/threerings/presents/client/BlockingCommunicator.java @@ -447,7 +447,9 @@ public class BlockingCommunicator extends Communicator _datagramChannel.write(buf); // notify the tracker - _client.getMessageTracker().messageSent(true, size, msg); + if (_client != null) { + _client.getMessageTracker().messageSent(true, size, msg); + } } /** @@ -502,7 +504,9 @@ public class BlockingCommunicator extends Communicator if (debugLogMessages()) { log.info("DATAGRAM " + msg); } - _client.getMessageTracker().messageReceived(true, size, msg); + if (_client != null) { + _client.getMessageTracker().messageReceived(true, size, msg); + } return msg; } catch (ClassNotFoundException cnfe) {