Fixed javadocs for createConnectionManager, and asserted error when custom implemenation would return null

Author: smarek

library/src/main/java/com/loopj/android/http/AsyncHttpClient.java

@@ -49,6 +49,7 @@
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.params.ClientPNames;
 import org.apache.http.client.protocol.ClientContext;
+import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.params.ConnManagerParams;
 import org.apache.http.conn.params.ConnPerRouteBean;
 import org.apache.http.conn.params.ConnRoutePNames;
@@ -237,7 +238,8 @@ public AsyncHttpClient(SchemeRegistry schemeRegistry) {
 
         HttpProtocolParams.setVersion(httpParams, HttpVersion.HTTP_1_1);
 
-        ThreadSafeClientConnManager cm = new ThreadSafeClientConnManager(httpParams, schemeRegistry);
+        ClientConnectionManager cm = createConnectionManager(schemeRegistry, httpParams);
+        Utils.asserts(cm != null, "Custom implementation of #createConnectionManager(SchemeRegistry, BasicHttpParams) returned null");
 
         threadPool = getDefaultThreadPool();
         requestMap = Collections.synchronizedMap(new WeakHashMap<Context, List<RequestHandle>>());
@@ -382,6 +384,17 @@ protected ExecutorService getDefaultThreadPool() {
         return Executors.newCachedThreadPool();
     }
 
+    /**
+     * Provided so it is easier for developers to provide custom ThreadSafeClientConnManager implementation
+     *
+     * @param schemeRegistry SchemeRegistry, usually provided by {@link #getDefaultSchemeRegistry(boolean, int, int)}
+     * @param httpParams     BasicHttpParams
+     * @return ClientConnectionManager instance
+     */
+    protected ClientConnectionManager createConnectionManager(SchemeRegistry schemeRegistry, BasicHttpParams httpParams) {
+        return new ThreadSafeClientConnManager(httpParams, schemeRegistry);
+    }
+
     /**
      * Simple interface method, to enable or disable redirects. If you set manually RedirectHandler
      * on underlying HttpClient, effects of this method will be canceled. <p>&nbsp;</p> Default
@@ -1065,7 +1078,7 @@ public RequestHandle put(Context context, String url, Header[] headers, HttpEnti
         if (headers != null) request.setHeaders(headers);
         return sendRequest(httpClient, httpContext, request, contentType, responseHandler, context);
     }
-    
+
     /**
      * Perform a HTTP PATCH request, without any parameters.
      *
@@ -1101,20 +1114,19 @@ public RequestHandle patch(String url, RequestParams params, ResponseHandlerInte
     public RequestHandle patch(Context context, String url, RequestParams params, ResponseHandlerInterface responseHandler) {
         return patch(context, url, paramsToEntity(params, responseHandler), null, responseHandler);
     }
-    
+
     /**
      * Perform a HTTP PATCH request and track the Android Context which initiated the request.
      *
      * @param context         the Android Context which initiated the request.
      * @param url             the URL to send the request to.
-     * @param params          additional PUT parameters or files to send with the request.
      * @param responseHandler the response handler instance that should handle the response.
      * @return RequestHandle of future request process
      */
     public RequestHandle patch(Context context, String url, HttpEntity entity, String contentType, ResponseHandlerInterface responseHandler) {
         return sendRequest(httpClient, httpContext, addEntityToRequestBase(new HttpPatch(URI.create(url).normalize()), entity), contentType, responseHandler, context);
     }
-    
+
     /**
      * Perform a HTTP PATCH request and track the Android Context which initiated the request. And set
      * one-time headers for the request
@@ -1131,11 +1143,11 @@ public RequestHandle patch(Context context, String url, HttpEntity entity, Strin
      * @return RequestHandle of future request process
      */
     public RequestHandle patch(Context context, String url, Header[] headers, HttpEntity entity, String contentType, ResponseHandlerInterface responseHandler) {
-    	HttpEntityEnclosingRequestBase request = addEntityToRequestBase(new HttpPatch(URI.create(url).normalize()), entity);
-    	if (headers != null) request.setHeaders(headers);
-    	return sendRequest(httpClient, httpContext, request, contentType, responseHandler, context);
+        HttpEntityEnclosingRequestBase request = addEntityToRequestBase(new HttpPatch(URI.create(url).normalize()), entity);
+        if (headers != null) request.setHeaders(headers);
+        return sendRequest(httpClient, httpContext, request, contentType, responseHandler, context);
     }
-    
+
     // [-] HTTP PUT
     // [+] HTTP DELETE