I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

writeString(String str): synchronize using socket write lock to prevent split SAM messages

Browse Source
This commit is contained in:
BlubMail
2009-09-06 00:43:45 +00:00
parent 1f1d089fda
commit 2341793546
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/sam/java/src/net/i2p/sam/SAMHandler.java
View File

@ -102,8 +102,8 @@ public abstract class SAMHandler implements Runnable {
}
static public void writeBytes(ByteBuffer data, SocketChannel out) throws IOException {
while (data.hasRemaining()) out.write(data);
out.socket().getOutputStream().flush();
while (data.hasRemaining()) out.write(data);
out.socket().getOutputStream().flush();
}
/**
@ -124,9 +124,13 @@ public abstract class SAMHandler implements Runnable {
* @return True if the string was successfully written, false otherwise
*/
protected final boolean writeString(String str) {
boolean success;
if (_log.shouldLog(Log.DEBUG))
_log.debug("Sending the client: [" + str + "]");
return writeString(str, socket);
synchronized (socketWLock) {
success = writeString(str, socket);
}
return success;
}
public static boolean writeString(String str, SocketChannel out)