4 files changed, 7 insertions, 5 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
index a538ce7..d7f515d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -157,6 +157,8 @@ public class AsyncHttpClient {
                 for (final SocketExchange se: sockets) {
                     final AsyncSocket socket = se.socket;
                     if (socket.isConnected()) {
+                        System.out.println("reuing socket");
+                        sockets.remove(se);
                         socket.setClosedCallback(null);
                         server.post(new Runnable() {
                             @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
index 27ef88b..8c23a20 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java
@@ -160,10 +160,10 @@ public class AsyncHttpResponseImpl extends DataTransformerBase implements AsyncH
     boolean mCompleted = false;
     protected void onCompleted(Exception ex) {
         // DISCONNECT. EVERYTHING.
+        mExchange.setDataCallback(null);
+        mExchange.setWriteableCallback(null);
         mSocket.setClosedCallback(null);
         mSocket.setExceptionCallback(null);
-        mSocket.setDataCallback(null);
-        mSocket.setWriteableCallback(null);
         mCompleted = true;
 //        System.out.println("closing up shop");
         if (mCompletedCallback != null)
diff --git a/AndroidAsyncSample/AndroidManifest.xml b/AndroidAsyncSample/AndroidManifest.xml
index 6b4d84e..c899ba7 100644
--- a/AndroidAsyncSample/AndroidManifest.xml
+++ b/AndroidAsyncSample/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".MainActivity"
+            android:name="com.koushikdutta.test.MainActivity"
             android:label="@string/title_activity_main" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/AndroidAsyncSample/src/com/koushikdutta/async/test/MainActivity.java b/AndroidAsyncSample/src/com/koushikdutta/test/MainActivity.java
index 5ee9a75..ed45671 100644
--- a/AndroidAsyncSample/src/com/koushikdutta/async/test/MainActivity.java
+++ b/AndroidAsyncSample/src/com/koushikdutta/test/MainActivity.java
@@ -1,4 +1,4 @@
-package com.koushikdutta.async.test;
+package com.koushikdutta.test;
 
 import java.io.File;
 
@@ -14,9 +14,9 @@ import android.widget.Button;
 import android.widget.ImageView;
 
 import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.test.R;
 
 public class MainActivity extends Activity {
-
     ImageView rommanager;
     ImageView tether;
     ImageView desksms;