diff options
3 files changed, 9 insertions, 18 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/Continuation.java b/AndroidAsync/src/com/koushikdutta/async/Continuation.java index 33151a6..ab1d452 100644 --- a/AndroidAsync/src/com/koushikdutta/async/Continuation.java +++ b/AndroidAsync/src/com/koushikdutta/async/Continuation.java @@ -38,7 +38,9 @@ public class Continuation implements ContinuationCallback { wrapper = new CompletedCallback() { @Override public void onCompleted(Exception ex) { - Assert.assertTrue(waiting); + // called twice? + if (!waiting) + return; waiting = false; if (ex == null) { next(); diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java index 70ac6f2..aa6fa74 100644 --- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java +++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java @@ -76,8 +76,10 @@ public class AsyncHttpClient { } final AsyncHttpResponseImpl ret = new AsyncHttpResponseImpl(request) { boolean keepalive = false; + boolean headersReceived; protected void onHeadersReceived() { try { + headersReceived = true; RawHeaders headers = getRawHeaders(); String kas = headers.get("Connection"); @@ -115,10 +117,11 @@ public class AsyncHttpClient { if (socket == null) return; super.report(ex); - if (!socket.isOpen()) - return; - if (ex != null) + if (!socket.isOpen() || ex != null) { + if (!headersReceived && ex != null) + callback.onConnectCompleted(ex, null); return; + } if (!keepalive) { socket.close(); } diff --git a/AndroidAsyncSample/gen/com/koushikdutta/async/R.java b/AndroidAsyncSample/gen/com/koushikdutta/async/R.java deleted file mode 100644 index 07e6084..0000000 --- a/AndroidAsyncSample/gen/com/koushikdutta/async/R.java +++ /dev/null @@ -1,14 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ -package com.koushikdutta.async; - -public final class R { - public static final class drawable { - public static final int ic_launcher = 0x7f020001; - public static final int ic_action_search = 0x7f020000; - } -} |