From 31eda1cfc928c435588fcd893528eee36886005a Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 13 Jul 2009 02:12:57 +0000 Subject: [PATCH] Let's do that *after* we've checked sochan for nullity. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5871 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/presents/server/net/ConnectionManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index 07b78557a..d1ce42628 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -1136,12 +1136,12 @@ public class ConnectionManager extends LoopingThread if (_partial != null) { // if our outgoing channel is gone or closed, then bail immediately SocketChannel sochan = conn.getChannel(); - if (sochan.isConnectionPending()) { - return false; // not ready to write to this connection yet - } if (sochan == null || (!sochan.isConnected() && !sochan.isConnectionPending())) { throw new IOException("Connection unavailable for overflow write " + sochan); } + if (sochan.isConnectionPending()) { + return false; // not ready to write to this connection yet + } // write all we can of our partial buffer int wrote = sochan.write(_partial);