wip

23 files changed, 94 insertions, 124 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocket.java
index 90d48b0..2df1bca 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocket.java
@@ -19,7 +19,6 @@ import junit.framework.Assert;
 
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
 
-import com.koushikdutta.async.callback.ClosedCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
@@ -286,7 +285,7 @@ public class AsyncSSLSocket implements AsyncSocket {
     }
 
     private void report(Exception e) {
-        CompletedCallback cb = getCompletedCallback();
+        CompletedCallback cb = getEndCallback();
         if (cb != null)
             cb.onCompleted(e);
     }
@@ -328,13 +327,13 @@ public class AsyncSSLSocket implements AsyncSocket {
     }
 
     @Override
-    public void setCompletedCallback(CompletedCallback callback) {
-        mSocket.setCompletedCallback(callback);
+    public void setEndCallback(CompletedCallback callback) {
+        mSocket.setEndCallback(callback);
     }
 
     @Override
-    public CompletedCallback getCompletedCallback() {
-        return mSocket.getCompletedCallback();
+    public CompletedCallback getEndCallback() {
+        return mSocket.getEndCallback();
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSocket.java
index 1e38336..3d45cb3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSocket.java
@@ -1,6 +1,6 @@
 package com.koushikdutta.async;
 
 
-public interface AsyncSocket extends DataEmitter, DataSink, CloseableData, CompletedEmitter {
+public interface AsyncSocket extends DataEmitter, DataSink {
     public AsyncServer getServer();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSocketImpl.java
index 8c9da8d..412dbd8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSocketImpl.java
@@ -8,7 +8,6 @@ import java.nio.channels.SocketChannel;
 
 import junit.framework.Assert;
 
-import com.koushikdutta.async.callback.ClosedCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
@@ -61,8 +60,8 @@ class AsyncSocketImpl implements AsyncSocket {
         }
         catch (IOException e) {
             close();
-            report(e);
-            reportClose();
+            reportEndPending(e);
+            reportClose(e);
         }
     }
     
@@ -94,8 +93,8 @@ class AsyncSocketImpl implements AsyncSocket {
         }
         catch (IOException ex) {
             close();
-            report(ex);
-            reportClose();
+            reportEndPending(ex);
+            reportClose(ex);
         }
     }
 
@@ -143,34 +142,27 @@ class AsyncSocketImpl implements AsyncSocket {
                 }
             }
 
-            // TODO: How what happens in the following scenario:
-            // socket paused, closed, resumed?
-            // close handler gets fired, but data is still available.
-            if (closed)
-                reportPendingClose();
+            if (closed) {
+                reportEndPending(null);
+                reportClose(null);
+            }
         }
         catch (Exception e) {
             closeInternal();
-            report(e);
-            reportClose();
+            reportEndPending(e);
+            reportClose(e);
         }
         
         return total;
     }
     
-    private void reportPendingClose() {
-        if (pending != null)
-            return;
-        reportClose();
-    }
-    
     boolean closeReported;
-    private void reportClose() {
+    private void reportClose(Exception e) {
         if (closeReported)
             return;
         closeReported = true;
         if (mClosedHander != null) {
-            mClosedHander.onCompleted(null);
+            mClosedHander.onCompleted(e);
             mClosedHander = null;
         }
     }
@@ -178,7 +170,7 @@ class AsyncSocketImpl implements AsyncSocket {
     @Override
     public void close() {
         closeInternal();
-        reportClose();
+        reportClose(null);
     }
 
     public void closeInternal() {
@@ -230,22 +222,34 @@ class AsyncSocketImpl implements AsyncSocket {
         return mWriteableHandler;
     }
 
-    void report(Exception e) {
-        if (mExceptionCallback != null)
-            mExceptionCallback.onCompleted(e);
-        else
+    void reportEnd(Exception e) {
+        if (mEndReported)
+            return;
+        mEndReported = true;
+        if (mCompletedCallback != null)
+            mCompletedCallback.onCompleted(e);
+        else if (e != null)
             e.printStackTrace();
     }
+    boolean mEndReported;
+    Exception mPendingEndException;
+    void reportEndPending(Exception e) {
+        if (pending != null) {
+            mPendingEndException = e;
+            return;
+        }
+        reportEnd(e);
+    }
     
-    private CompletedCallback mExceptionCallback;
+    private CompletedCallback mCompletedCallback;
     @Override
-    public void setCompletedCallback(CompletedCallback callback) {
-        mExceptionCallback = callback;
+    public void setEndCallback(CompletedCallback callback) {
+        mCompletedCallback = callback;
     }
 
     @Override
-    public CompletedCallback getCompletedCallback() {
-        return mExceptionCallback;
+    public CompletedCallback getEndCallback() {
+        return mCompletedCallback;
     }
 
     @Override
@@ -291,7 +295,7 @@ class AsyncSocketImpl implements AsyncSocket {
         }
         spitPending();
         if (!isOpen())
-            reportPendingClose();
+            reportEndPending(mPendingEndException);
     }
     
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
index cedad5e..fa501f7 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
@@ -61,12 +61,12 @@ public class BufferedDataEmitter implements DataEmitter, DataCallback {
     }
 
     @Override
-    public void setCompletedCallback(CompletedCallback callback) {
-        mEmitter.setCompletedCallback(callback);
+    public void setEndCallback(CompletedCallback callback) {
+        mEmitter.setEndCallback(callback);
     }
 
     @Override
-    public CompletedCallback getCompletedCallback() {
-        return mEmitter.getCompletedCallback();
+    public CompletedCallback getEndCallback() {
+        return mEmitter.getEndCallback();
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/CloseableData.java b/AndroidAsync/src/com/koushikdutta/async/CloseableData.java
deleted file mode 100644
index 2330474..0000000
--- a/AndroidAsync/src/com/koushikdutta/async/CloseableData.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.koushikdutta.async;
-
-import com.koushikdutta.async.callback.ClosedCallback;
-import com.koushikdutta.async.callback.CompletedCallback;
-
-public interface CloseableData {
-    public boolean isOpen();
-    public void close();
-    public void setClosedCallback(CompletedCallback handler);
-    public CompletedCallback getCloseHandler();
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/CompletedEmitter.java b/AndroidAsync/src/com/koushikdutta/async/CompletedEmitter.java
deleted file mode 100644
index 3eb7bf7..0000000
--- a/AndroidAsync/src/com/koushikdutta/async/CompletedEmitter.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.koushikdutta.async;
-
-import com.koushikdutta.async.callback.CompletedCallback;
-
-public interface CompletedEmitter {
-    public void setCompletedCallback(CompletedCallback callback);
-    public CompletedCallback getCompletedCallback();
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java
index 26ab889..f9a9ee3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataEmitter.java
@@ -1,12 +1,15 @@
 package com.koushikdutta.async;
 
+import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 
-public interface DataEmitter extends CompletedEmitter {
+public interface DataEmitter {
     public void setDataCallback(DataCallback callback);
     public DataCallback getDataCallback();
     public boolean isChunked();
     public void pause();
     public void resume();
     public boolean isPaused();
+    public void setEndCallback(CompletedCallback callback);
+    public CompletedCallback getEndCallback();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataSink.java b/AndroidAsync/src/com/koushikdutta/async/DataSink.java
index 6690589..af01776 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataSink.java
@@ -2,11 +2,17 @@ package com.koushikdutta.async;
 
 import java.nio.ByteBuffer;
 
+import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 
-public interface DataSink extends CloseableData {
+public interface DataSink {
     public void write(ByteBuffer bb);
     public void write(ByteBufferList bb);
     public void setWriteableCallback(WritableCallback handler);
     public WritableCallback getWriteableCallback();
+    
+    public boolean isOpen();
+    public void close();
+    public void setClosedCallback(CompletedCallback handler);
+    public CompletedCallback getCloseHandler();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/FilteredDataCallback.java b/AndroidAsync/src/com/koushikdutta/async/FilteredDataCallback.java
index d5ac458..034ffaf 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FilteredDataCallback.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FilteredDataCallback.java
@@ -5,7 +5,7 @@ import junit.framework.Assert;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 
-public class FilteredDataCallback implements DataEmitter, DataCallback, CompletedEmitter {
+public class FilteredDataCallback implements DataEmitter, DataCallback {
     public FilteredDataCallback() {
     }
 
@@ -31,12 +31,12 @@ public class FilteredDataCallback implements DataEmitter, DataCallback, Complete
     }
     
     @Override
-    public CompletedCallback getCompletedCallback() {
+    public CompletedCallback getEndCallback() {
         return mCompletedCallback;
     }
     
     @Override
-    public void setCompletedCallback(CompletedCallback callback) {
+    public void setEndCallback(CompletedCallback callback) {
         mCompletedCallback = callback;
     }
     CompletedCallback mCompletedCallback;
diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
index 47bc10b..6b351eb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -61,8 +61,8 @@ public class Util {
                     int remaining;
                     do {
                         if (pending.remaining() == 0) {
-                            int available = is.available();
-                            System.out.println(available);
+//                            int available = is.available();
+//                            System.out.println(available);
                             int read = is.read(buffer);
                             if (read == -1) {
                                 close();
diff --git a/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java b/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java
index 3014ca3..805145b 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ZipDataSink.java
@@ -8,7 +8,7 @@ import java.util.zip.ZipOutputStream;
 
 import com.koushikdutta.async.callback.CompletedCallback;
 
-public class ZipDataSink extends FilteredDataSink implements CompletedEmitter {
+public class ZipDataSink extends FilteredDataSink {
     public ZipDataSink(DataSink sink) {
         super(sink);
     }
@@ -26,8 +26,9 @@ public class ZipDataSink extends FilteredDataSink implements CompletedEmitter {
     }
     
     protected void report(Exception e) {
-        if (mCompleted != null)
-            mCompleted.onCompleted(null);
+        CompletedCallback closed = getCloseHandler();
+        if (closed != null)
+            closed.onCompleted(e);
     }
 
     private boolean closed = false;
@@ -73,15 +74,4 @@ public class ZipDataSink extends FilteredDataSink implements CompletedEmitter {
             return null;
         }
     }
-
-    private CompletedCallback mCompleted;
-    @Override
-    public void setCompletedCallback(CompletedCallback callback) {
-        mCompleted = callback;
-    }
-
-    @Override
-    public CompletedCallback getCompletedCallback() {
-        return mCompleted;
-    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/callback/ClosedCallback.java b/AndroidAsync/src/com/koushikdutta/async/callback/ClosedCallback.java
deleted file mode 100644
index 9ae034e..0000000
--- a/AndroidAsync/src/com/koushikdutta/async/callback/ClosedCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.koushikdutta.async.callback;
-
-public interface ClosedCallback {
-    public void onClosed();
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index fa457d7..12d8616 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -23,7 +23,6 @@ import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.NullDataCallback;
-import com.koushikdutta.async.callback.ClosedCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.callback.DataCallback;
@@ -137,11 +136,16 @@ public class AsyncHttpClient {
                             return null;
                         socket.setWriteableCallback(null);
                         socket.setClosedCallback(null);
-                        socket.setCompletedCallback(null);
+                        socket.setEndCallback(null);
                         socket.setDataCallback(null);
                         setSocket(null);
                         return socket;
                     }
+
+                    @Override
+                    public boolean isReusedSocket() {
+                        return reused;
+                    }
                 };
 
                 // if this socket is not being reused,
@@ -166,6 +170,7 @@ public class AsyncHttpClient {
                         server.post(new Runnable() {
                             @Override
                             public void run() {
+                                System.out.println("resued");
                                 socketConnected.reused = true;
                                 socketConnected.onConnectCompleted(null, socket);
                             }
@@ -372,7 +377,7 @@ public class AsyncHttpClient {
                         invokeProgress(handler, callback, response, mDownloaded, contentLength);
                     }
                 });
-                response.setCompletedCallback(new CompletedCallback() {
+                response.setEndCallback(new CompletedCallback() {
                     @Override
                     public void onCompleted(Exception ex) {
                         try {
@@ -416,7 +421,7 @@ public class AsyncHttpClient {
                         invokeProgress(handler, callback, response, mDownloaded, contentLength);
                     }
                 });
-                response.setCompletedCallback(new CompletedCallback() {
+                response.setEndCallback(new CompletedCallback() {
                     @Override
                     public void onCompleted(Exception ex) {
                         try {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
index 24b515d..9e3a90a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponse.java
@@ -1,16 +1,16 @@
 package com.koushikdutta.async.http;
 
 import com.koushikdutta.async.AsyncSocket;
-import com.koushikdutta.async.CompletedEmitter;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.libcore.ResponseHeaders;
 
-public interface AsyncHttpResponse extends DataEmitter, DataSink, CompletedEmitter {
-    public void setCompletedCallback(CompletedCallback handler);
-    public CompletedCallback getCompletedCallback();
+public interface AsyncHttpResponse extends DataEmitter, DataSink {
+    public void setEndCallback(CompletedCallback handler);
+    public CompletedCallback getEndCallback();
     public ResponseHeaders getHeaders();
     public void end();
     public AsyncSocket detachSocket();
+    public boolean isReusedSocket();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index b1bcf25..64d896f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -12,7 +12,6 @@ import com.koushikdutta.async.FilteredDataCallback;
 import com.koushikdutta.async.LineEmitter;
 import com.koushikdutta.async.LineEmitter.StringCallback;
 import com.koushikdutta.async.NullDataCallback;
-import com.koushikdutta.async.callback.ClosedCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
@@ -63,7 +62,7 @@ abstract class AsyncHttpResponseImpl extends FilteredDataCallback implements Asy
         LineEmitter liner = new LineEmitter(exchange);
         liner.setLineCallback(mHeaderCallback);
         
-        mSocket.setCompletedCallback(mReporter);
+        mSocket.setEndCallback(mReporter);
         mSocket.setClosedCallback(new CompletedCallback() {
             @Override
             public void onCompleted(Exception ex) {
@@ -125,7 +124,7 @@ abstract class AsyncHttpResponseImpl extends FilteredDataCallback implements Asy
         });
         mSocket.setWriteableCallback(null);
         mSocket.setClosedCallback(null);
-        mSocket.setCompletedCallback(null);
+        mSocket.setEndCallback(null);
         mCompleted = true;
 //        System.out.println("closing up shop");
 //        if (mCompletedCallback != null)
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Util.java b/AndroidAsync/src/com/koushikdutta/async/http/Util.java
index 89af1d2..fe2bfe4 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Util.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Util.java
@@ -35,12 +35,12 @@ public class Util {
         if ("gzip".equals(headers.get("Content-Encoding"))) {
             GZIPInputFilter gunzipper = new GZIPInputFilter();
             gunzipper.setDataCallback(callback);
-            gunzipper.setCompletedCallback(reporter);
+            gunzipper.setEndCallback(reporter);
             callback = gunzipper;
         }        
         else if ("deflate".equals(headers.get("Content-Encoding"))) {
             InflaterInputFilter inflater = new InflaterInputFilter();
-            inflater.setCompletedCallback(reporter);
+            inflater.setEndCallback(reporter);
             inflater.setDataCallback(callback);
             callback = inflater;
         }
@@ -76,13 +76,13 @@ public class Util {
                 }
             };
             contentLengthWatcher.setDataCallback(callback);
-            contentLengthWatcher.setCompletedCallback(reporter);
+            contentLengthWatcher.setEndCallback(reporter);
             callback = contentLengthWatcher;
         }
         else if ("chunked".equalsIgnoreCase(headers.get("Transfer-Encoding"))) {
             ChunkedInputFilter chunker = new ChunkedInputFilter();
             
-            chunker.setCompletedCallback(reporter);
+            chunker.setEndCallback(reporter);
             chunker.setDataCallback(callback);
             callback = chunker;
         }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
index 61f9505..71dce06 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocket.java
@@ -7,18 +7,12 @@ public interface WebSocket extends AsyncSocket {
     static public interface StringCallback {
         public void onStringAvailable(String s);
     }
-    
-//    static public interface DataCallback {
-//        public void onDataAvailable(byte[] data);
-//    }
-    
+
     public void send(byte[] bytes);
     public void send(String string);
     
     public void setStringCallback(StringCallback callback);
-//    public void setDataCallback(DataCallback callback);
     public StringCallback getStringCallback();
-//    public DataCallback getDataCallback();
     
     public boolean isBuffering();
     
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index e6c0c75..24aa3b1 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -12,7 +12,6 @@ import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.Util;
-import com.koushikdutta.async.callback.ClosedCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
@@ -177,12 +176,12 @@ public class WebSocketImpl implements WebSocket {
 
     CompletedCallback mExceptionCallback;
     @Override
-    public void setCompletedCallback(CompletedCallback callback) {
+    public void setEndCallback(CompletedCallback callback) {
         mExceptionCallback = callback;
     }
 
     @Override
-    public CompletedCallback getCompletedCallback() {
+    public CompletedCallback getEndCallback() {
         return mExceptionCallback;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyBase.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyBase.java
index b94d18f..3db423a 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyBase.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyBase.java
@@ -26,7 +26,7 @@ public class AsyncHttpRequestBodyBase extends FilteredDataCallback implements As
 
     @Override
     public void onCompleted(Exception ex) {
-        CompletedCallback callback = getCompletedCallback();
+        CompletedCallback callback = getEndCallback();
         if (callback != null)
             callback.onCompleted(ex);
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 78e0e71..470d28c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -20,7 +20,6 @@ import android.content.Context;
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
 import com.koushikdutta.async.AsyncSocket;
-import com.koushikdutta.async.CompletedEmitter;
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ListenCallback;
@@ -32,7 +31,7 @@ import com.koushikdutta.async.http.WebSocketImpl;
 import com.koushikdutta.async.http.libcore.RawHeaders;
 import com.koushikdutta.async.http.libcore.RequestHeaders;
 
-public class AsyncHttpServer implements CompletedEmitter {
+public class AsyncHttpServer {
     ArrayList<AsyncServerSocket> mListeners = new ArrayList<AsyncServerSocket>();
     public void stop() {
         if (mListeners != null) {
@@ -185,13 +184,11 @@ public class AsyncHttpServer implements CompletedEmitter {
     }
 
     CompletedCallback mCompletedCallback;
-    @Override
-    public void setCompletedCallback(CompletedCallback callback) {
+    public void setErrorCallback(CompletedCallback callback) {
         mCompletedCallback = callback;        
     }
 
-    @Override
-    public CompletedCallback getCompletedCallback() {
+    public CompletedCallback getErrorCallback() {
         return mCompletedCallback;
     }
     
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
index 0df15a7..6b69012 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
@@ -4,12 +4,11 @@ import java.util.Map;
 import java.util.regex.Matcher;
 
 import com.koushikdutta.async.AsyncSocket;
-import com.koushikdutta.async.CompletedEmitter;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.http.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.libcore.RequestHeaders;
 
-public interface AsyncHttpServerRequest extends DataEmitter, CompletedEmitter {
+public interface AsyncHttpServerRequest extends DataEmitter {
     public RequestHeaders getHeaders();
     public Matcher getMatcher();
     public AsyncHttpRequestBody getBody();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index 579d9a4..5d25b98 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -19,12 +19,12 @@ public abstract class AsyncHttpServerRequestImpl implements AsyncHttpServerReque
 
     private CompletedCallback mCompleted;
     @Override
-    public void setCompletedCallback(CompletedCallback callback) {
+    public void setEndCallback(CompletedCallback callback) {
         mCompleted = callback;
     }
 
     @Override
-    public CompletedCallback getCompletedCallback() {
+    public CompletedCallback getEndCallback() {
         return mCompleted;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index c092a37..6764050 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -15,7 +15,6 @@ import com.koushikdutta.async.BufferedDataSink;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.FilteredDataSink;
 import com.koushikdutta.async.Util;
-import com.koushikdutta.async.callback.ClosedCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;