AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset the framing output stream before we write the message rather than after

Browse Source 
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
This commit is contained in:
Michael Bayne
2007-04-05 17:20:53 +00:00
parent 546c44c600
commit 3ac5ab2e10
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/server/net/ConnectionManager.java
+4 -4
View File
@@ -724,8 +724,10 @@ public class ConnectionManager extends LoopingThread
Thread.dumpStack(); Thread.dumpStack();
} else { } else {
// flatten this message using the connection's output stream
try { try {
_framer.resetFrame();
// flatten this message using the connection's output stream
ObjectOutputStream oout = conn.getObjectOutputStream(_framer); ObjectOutputStream oout = conn.getObjectOutputStream(_framer);
oout.writeObject(msg); oout.writeObject(msg);
oout.flush(); oout.flush();
@@ -734,10 +736,8 @@ public class ConnectionManager extends LoopingThread
ByteBuffer buffer = _framer.frameAndReturnBuffer(); ByteBuffer buffer = _framer.frameAndReturnBuffer();
byte[] data = new byte[buffer.limit()]; byte[] data = new byte[buffer.limit()];
buffer.get(data); buffer.get(data);
_framer.resetFrame();
// Log.info("Flattened " + msg + " into " + // Log.info("Flattened " + msg + " into " + data.length + " bytes.");
// data.length + " bytes.");
// and slap both on the queue // and slap both on the queue
_outq.append(new Tuple<Connection,byte[]>(conn, data)); _outq.append(new Tuple<Connection,byte[]>(conn, data));