From 3ac5ab2e1000743fb959a9dfe21a59a79de116c2 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 5 Apr 2007 17:20:53 +0000 Subject: [PATCH] Reset the framing output stream before we write the message rather than after in case we freak out in the middle of writing a message. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4645 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/presents/server/net/ConnectionManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index 0564af97e..e2fe57577 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -724,8 +724,10 @@ public class ConnectionManager extends LoopingThread Thread.dumpStack(); } else { - // flatten this message using the connection's output stream try { + _framer.resetFrame(); + + // flatten this message using the connection's output stream ObjectOutputStream oout = conn.getObjectOutputStream(_framer); oout.writeObject(msg); oout.flush(); @@ -734,10 +736,8 @@ public class ConnectionManager extends LoopingThread ByteBuffer buffer = _framer.frameAndReturnBuffer(); byte[] data = new byte[buffer.limit()]; buffer.get(data); - _framer.resetFrame(); -// Log.info("Flattened " + msg + " into " + -// data.length + " bytes."); +// Log.info("Flattened " + msg + " into " + data.length + " bytes."); // and slap both on the queue _outq.append(new Tuple(conn, data));