From 4dc85174bab00e3ea87fd269e81cac770d1c8b6c Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <andrzej@threerings.net>
Date: Tue, 4 Aug 2009 19:41:01 +0000
Subject: [PATCH] Fix for NPE in closing datagram channel.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5896 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/presents/client/BlockingCommunicator.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/presents/client/BlockingCommunicator.java b/src/java/com/threerings/presents/client/BlockingCommunicator.java
index bade94571..02536cae8 100644
--- a/src/java/com/threerings/presents/client/BlockingCommunicator.java
+++ b/src/java/com/threerings/presents/client/BlockingCommunicator.java
@@ -336,9 +336,12 @@ public class BlockingCommunicator extends Communicator
     {
         // clear out our writer reference
         _datagramWriter = null;
-        log.debug("Datagram writer thread exited.");
 
-        closeDatagramChannel();
+        if (_datagramReader == null) {
+            closeDatagramChannel();
+        }
+
+        log.debug("Datagram writer thread exited.");
     }
 
     /**