Changed sending of handshake using single SocketChannel.write() call

morkai · morkai · commit 63d68919c604 · 2010-11-26T20:23:17.000+01:00
for DRAFT76
diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -227,9 +227,16 @@ private void sendHandshake() throws IOException {
     }
     
     request += "\r\n";
-    conn.socketChannel().write(ByteBuffer.wrap(request.getBytes(WebSocket.UTF8_CHARSET)));
+    
     if (this.key3 != null) {
-      conn.socketChannel().write(ByteBuffer.wrap(this.key3));
+      conn.socketChannel().write(new ByteBuffer[] {
+        ByteBuffer.wrap(request.getBytes(WebSocket.UTF8_CHARSET)),
+        ByteBuffer.wrap(this.key3)
+      });
+    }
+    else
+    {
+      conn.socketChannel().write(ByteBuffer.wrap(request.getBytes(WebSocket.UTF8_CHARSET)));
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -227,9 +227,16 @@ private void sendHandshake() throws IOException {`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`request += "\r\n";`
`230`		`- conn.socketChannel().write(ByteBuffer.wrap(request.getBytes(WebSocket.UTF8_CHARSET)));`
	`230`	`+`
`231`	`231`	`if (this.key3 != null) {`
`232`		`- conn.socketChannel().write(ByteBuffer.wrap(this.key3));`
	`232`	`+ conn.socketChannel().write(new ByteBuffer[] {`
	`233`	`+ ByteBuffer.wrap(request.getBytes(WebSocket.UTF8_CHARSET)),`
	`234`	`+ ByteBuffer.wrap(this.key3)`
	`235`	`+ });`
	`236`	`+ }`
	`237`	`+ else`
	`238`	`+ {`
	`239`	`+ conn.socketChannel().write(ByteBuffer.wrap(request.getBytes(WebSocket.UTF8_CHARSET)));`
`233`	`240`	`}`
`234`	`241`	`}`
`235`	`242`