fix #379

remove mWritePendings duplicating in one ws socket connection

AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java

@@ -2,6 +2,7 @@ package com.koushikdutta.async.http.filter;
 
 import java.nio.ByteBuffer;
 
+import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.FilteredDataSink;
@@ -11,6 +12,10 @@ public class ChunkedOutputFilter extends FilteredDataSink {
         super(sink);
     }
 
+    public ChunkedOutputFilter(AsyncSocket mSocket, ByteBufferList mWritePenings) {
+        super(mSocket, mWritePenings);
+    }
+
     @Override
     public ByteBufferList filter(ByteBufferList bb) {
         String chunkLen = Integer.toString(bb.remaining(), 16) + "\r\n";

AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedOutputFilter.java

@@ -2,6 +2,7 @@ package com.koushikdutta.async.http.filter;
 
 import java.nio.ByteBuffer;
 
+import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.FilteredDataSink;
@@ -11,6 +12,10 @@ public class ChunkedOutputFilter extends FilteredDataSink {
         super(sink);
     }
 
+    public ChunkedOutputFilter(AsyncSocket mSocket, ByteBufferList mWritePenings) {
+        super(mSocket, mWritePenings);
+    }
+
     @Override
     public ByteBufferList filter(ByteBufferList bb) {
         String chunkLen = Integer.toString(bb.remaining(), 16) + "\r\n";

AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponse.java

 package com.koushikdutta.async.http.server;
 
 import com.koushikdutta.async.AsyncSocket;
+import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.AsyncHttpResponse;
@@ -34,4 +35,6 @@ public interface AsyncHttpServerResponse extends DataSink, CompletedCallback {
      */
     public void onCompleted(Exception ex);
     public AsyncSocket getSocket();
+
+    void writeHead(ByteBufferList mWritePendings);
 }

AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java

@@ -2,11 +2,7 @@ package com.koushikdutta.async.http.server;
 
 import android.text.TextUtils;
 
-import com.koushikdutta.async.AsyncServer;
-import com.koushikdutta.async.AsyncSocket;
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.DataSink;
-import com.koushikdutta.async.Util;
+import com.koushikdutta.async.*;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
@@ -31,6 +27,7 @@ import java.util.Locale;
 public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
     private Headers mRawHeaders = new Headers();
     private long mContentLength = -1;
+    private ByteBufferList mWritePendings;
 
     @Override
     public Headers getHeaders() {
@@ -108,12 +105,12 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
                     return;
                 }
                 if (isChunked) {
-                    ChunkedOutputFilter chunked = new ChunkedOutputFilter(mSocket);
+                    ChunkedOutputFilter chunked = new ChunkedOutputFilter(mSocket, mWritePendings);
                     chunked.setMaxBuffer(0);
                     mSink = chunked;
                 }
                 else {
-                    mSink = mSocket;
+                    mSink = new BufferedDataSink(mSocket, mWritePendings);
                 }
 
                 mSink.setClosedCallback(closedCallback);
@@ -192,6 +189,12 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
         initFirstWrite();
     }
 
+    @Override
+    public void writeHead(ByteBufferList mWritePendings) {
+        this.mWritePendings = mWritePendings;
+        writeHead();
+    }
+
     @Override
     public void setContentType(String contentType) {
         mRawHeaders.set("Content-Type", contentType);

AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java

@@ -21,6 +21,9 @@ import java.util.LinkedList;
 import java.util.UUID;
 
 public class WebSocketImpl implements WebSocket {
+
+    private final ByteBufferList mWritePendings = new ByteBufferList();
+
     @Override
     public void end() {
         mSocket.end();
@@ -136,7 +139,7 @@ public class WebSocketImpl implements WebSocket {
             response.getHeaders().set("Sec-WebSocket-Protocol", protocol);
 //        if (origin != null)
 //            response.getHeaders().getHeaders().set("Access-Control-Allow-Origin", "http://" + origin);
-        response.writeHead();
+        response.writeHead(mWritePendings);
         
         setupParser(false, false);
     }
@@ -159,7 +162,7 @@ public class WebSocketImpl implements WebSocket {
     
     public WebSocketImpl(AsyncSocket socket) {
         mSocket = socket;
-        mSink = new BufferedDataSink(mSocket);
+        mSink = new BufferedDataSink(mSocket, mWritePendings);
     }
     
     public static WebSocket finishHandshake(Headers requestHeaders, AsyncHttpResponse response) {

AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java

@@ -8,9 +8,15 @@ import java.nio.ByteBuffer;
 public class BufferedDataSink implements DataSink {
     DataSink mDataSink;
     public BufferedDataSink(DataSink datasink) {
+        mPendingWrites = new ByteBufferList();
         setDataSink(datasink);
     }
 
+    public BufferedDataSink(AsyncSocket mSocket, ByteBufferList byteBufferList) {
+        mPendingWrites = byteBufferList;
+        setDataSink(mSocket);
+    }
+
     public boolean isBuffering() {
         return mPendingWrites.hasRemaining() || forceBuffering;
     }
@@ -52,7 +58,7 @@ public class BufferedDataSink implements DataSink {
             mWritable.onWriteable();
     }
     
-    ByteBufferList mPendingWrites = new ByteBufferList();
+    ByteBufferList mPendingWrites;
 
     @Override
     public void write(ByteBufferList bb) {

AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java

@@ -5,7 +5,12 @@ public class FilteredDataSink extends BufferedDataSink {
         super(sink);
         setMaxBuffer(0);
     }
-    
+
+    public FilteredDataSink(AsyncSocket mSocket, ByteBufferList mWritePendings) {
+        super(mSocket, mWritePendings);
+        setMaxBuffer(0);
+    }
+
     public ByteBufferList filter(ByteBufferList bb) {
         return bb;
     }