6363
6464import java .io .IOException ;
6565import java .io .InputStream ;
66- import java .lang .ref .WeakReference ;
6766import java .util .HashMap ;
67+ import java .util .Iterator ;
6868import java .util .LinkedList ;
6969import java .util .List ;
7070import java .util .Map ;
7171import java .util .WeakHashMap ;
72+ import java .util .concurrent .ExecutorService ;
7273import java .util .concurrent .Executors ;
73- import java .util .concurrent .Future ;
7474import java .util .concurrent .ThreadPoolExecutor ;
7575import java .util .zip .GZIPInputStream ;
7676
9191 * </pre>
9292 */
9393public class AsyncHttpClient {
94- private static final String VERSION = "1.4.4" ;
9594
96- private static final int DEFAULT_MAX_CONNECTIONS = 10 ;
97- private static final int DEFAULT_SOCKET_TIMEOUT = 10 * 1000 ;
98- private static final int DEFAULT_MAX_RETRIES = 5 ;
99- private static final int DEFAULT_RETRY_SLEEP_TIME_MILLIS = 1500 ;
100- private static final int DEFAULT_SOCKET_BUFFER_SIZE = 8192 ;
101- private static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding" ;
102- private static final String ENCODING_GZIP = "gzip" ;
103- private static final String LOG_TAG = "AsyncHttpClient" ;
95+ public static final String VERSION = "1.4.5" ;
96+ public static final int DEFAULT_MAX_CONNECTIONS = 10 ;
97+ public static final int DEFAULT_SOCKET_TIMEOUT = 10 * 1000 ;
98+ public static final int DEFAULT_MAX_RETRIES = 5 ;
99+ public static final int DEFAULT_RETRY_SLEEP_TIME_MILLIS = 1500 ;
100+ public static final int DEFAULT_SOCKET_BUFFER_SIZE = 8192 ;
101+ public static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding" ;
102+ public static final String ENCODING_GZIP = "gzip" ;
103+ public static final String LOG_TAG = "AsyncHttpClient" ;
104104
105105 private int maxConnections = DEFAULT_MAX_CONNECTIONS ;
106106 private int timeout = DEFAULT_SOCKET_TIMEOUT ;
107107
108108 private final DefaultHttpClient httpClient ;
109109 private final HttpContext httpContext ;
110- private ThreadPoolExecutor threadPool ;
111- private final Map <Context , List <WeakReference < Future <?>> >> requestMap ;
110+ private ExecutorService threadPool ;
111+ private final Map <Context , List <RequestHandle >> requestMap ;
112112 private final Map <String , String > clientHeaderMap ;
113113 private boolean isUrlEncodingEnabled = true ;
114114
@@ -209,8 +209,8 @@ public AsyncHttpClient(SchemeRegistry schemeRegistry) {
209209
210210 ThreadSafeClientConnManager cm = new ThreadSafeClientConnManager (httpParams , schemeRegistry );
211211
212- threadPool = ( ThreadPoolExecutor ) Executors .newFixedThreadPool ( DEFAULT_MAX_CONNECTIONS );
213- requestMap = new WeakHashMap <Context , List <WeakReference < Future <?>> >>();
212+ threadPool = Executors .newCachedThreadPool ( );
213+ requestMap = new WeakHashMap <Context , List <RequestHandle >>();
214214 clientHeaderMap = new HashMap <String , String >();
215215
216216 httpContext = new SyncBasicHttpContext (new BasicHttpContext ());
@@ -249,6 +249,18 @@ public void process(HttpResponse response, HttpContext context) {
249249 httpClient .setHttpRequestRetryHandler (new RetryHandler (DEFAULT_MAX_RETRIES , DEFAULT_RETRY_SLEEP_TIME_MILLIS ));
250250 }
251251
252+ public static void allowRetryExceptionClass (Class <?> cls ) {
253+ if (cls != null ) {
254+ RetryHandler .addClassToWhitelist (cls );
255+ }
256+ }
257+
258+ public static void blockRetryExceptionClass (Class <?> cls ) {
259+ if (cls != null ) {
260+ RetryHandler .addClassToBlacklist (cls );
261+ }
262+ }
263+
252264 /**
253265 * Get the underlying HttpClient instance. This is useful for setting additional fine-grained
254266 * settings for requests by accessing the client's ConnectionManager, HttpParams and
@@ -475,21 +487,16 @@ public void clearBasicAuth() {
475487 * pending requests.
476488 */
477489 public void cancelRequests (Context context , boolean mayInterruptIfRunning ) {
478- List <WeakReference < Future <?>> > requestList = requestMap .get (context );
490+ List <RequestHandle > requestList = requestMap .get (context );
479491 if (requestList != null ) {
480- for (WeakReference <Future <?>> requestRef : requestList ) {
481- Future <?> request = requestRef .get ();
482- if (request != null ) {
483- request .cancel (mayInterruptIfRunning );
484- }
492+ for (RequestHandle requestHandle : requestList ) {
493+ requestHandle .cancel (mayInterruptIfRunning );
485494 }
495+ requestMap .remove (context );
486496 }
487- requestMap .remove (context );
488497 }
489498
490- //
491- // HTTP HEAD Requests
492- //
499+ // [+] HTTP HEAD
493500
494501 /**
495502 * Perform a HTTP HEAD request, without any parameters.
@@ -558,10 +565,8 @@ public RequestHandle head(Context context, String url, Header[] headers, Request
558565 context );
559566 }
560567
561-
562- //
563- // HTTP GET Requests
564- //
568+ // [-] HTTP HEAD
569+ // [+] HTTP GET
565570
566571 /**
567572 * Perform a HTTP GET request, without any parameters.
@@ -630,10 +635,8 @@ public RequestHandle get(Context context, String url, Header[] headers, RequestP
630635 context );
631636 }
632637
633-
634- //
635- // HTTP POST Requests
636- //
638+ // [-] HTTP GET
639+ // [+] HTTP POST
637640
638641 /**
639642 * Perform a HTTP POST request, without any parameters.
@@ -732,9 +735,8 @@ public RequestHandle post(Context context, String url, Header[] headers, HttpEnt
732735 return sendRequest (httpClient , httpContext , request , contentType , responseHandler , context );
733736 }
734737
735- //
736- // HTTP PUT Requests
737- //
738+ // [-] HTTP POST
739+ // [+] HTTP PUT
738740
739741 /**
740742 * Perform a HTTP PUT request, without any parameters.
@@ -811,9 +813,8 @@ public RequestHandle put(Context context, String url, Header[] headers, HttpEnti
811813 return sendRequest (httpClient , httpContext , request , contentType , responseHandler , context );
812814 }
813815
814- //
815- // HTTP DELETE Requests
816- //
816+ // [-] HTTP PUT
817+ // [+] HTTP DELETE
817818
818819 /**
819820 * Perform a HTTP DELETE request.
@@ -870,6 +871,8 @@ public RequestHandle delete(Context context, String url, Header[] headers, Reque
870871 return sendRequest (httpClient , httpContext , httpDelete , null , responseHandler , context );
871872 }
872873
874+ // [-] HTTP DELETE
875+
873876 /**
874877 * Puts a new request in queue as a new thread in pool to be executed
875878 *
@@ -884,28 +887,35 @@ public RequestHandle delete(Context context, String url, Header[] headers, Reque
884887 */
885888 protected RequestHandle sendRequest (DefaultHttpClient client , HttpContext httpContext , HttpUriRequest uriRequest , String contentType , ResponseHandlerInterface responseHandler , Context context ) {
886889 if (contentType != null ) {
887- uriRequest .addHeader ("Content-Type" , contentType );
890+ uriRequest .setHeader ("Content-Type" , contentType );
888891 }
889892
890893 responseHandler .setRequestHeaders (uriRequest .getAllHeaders ());
891894 responseHandler .setRequestURI (uriRequest .getURI ());
892895
893- Future <?> request = threadPool .submit (new AsyncHttpRequest (client , httpContext , uriRequest , responseHandler ));
896+ AsyncHttpRequest request = new AsyncHttpRequest (client , httpContext , uriRequest , responseHandler );
897+ threadPool .submit (request );
898+ RequestHandle requestHandle = new RequestHandle (request );
894899
895900 if (context != null ) {
896901 // Add request to request map
897- List <WeakReference < Future <?>> > requestList = requestMap .get (context );
902+ List <RequestHandle > requestList = requestMap .get (context );
898903 if (requestList == null ) {
899- requestList = new LinkedList <WeakReference < Future <?>> >();
904+ requestList = new LinkedList <RequestHandle >();
900905 requestMap .put (context , requestList );
901906 }
902907
903- requestList .add (new WeakReference < Future <?>>( request ) );
908+ requestList .add (requestHandle );
904909
905- // TODO: Remove dead weakrefs from requestLists?
910+ Iterator <RequestHandle > iterator = requestList .iterator ();
911+ while (iterator .hasNext ()) {
912+ if (iterator .next ().shouldBeGarbageCollected ()) {
913+ iterator .remove ();
914+ }
915+ }
906916 }
907917
908- return new RequestHandle ( request ) ;
918+ return requestHandle ;
909919 }
910920
911921 /**
0 commit comments