Fix for http://java.net/jira/browse/GRIZZLY-1081. Custom threadpool is ignored when set in AsyncHttpClientConfigBuilder.

Author: rlubke

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -81,6 +81,7 @@
 import org.glassfish.grizzly.ssl.SSLEngineConfigurator;
 import org.glassfish.grizzly.ssl.SSLFilter;
 import org.glassfish.grizzly.strategies.SameThreadIOStrategy;
+import org.glassfish.grizzly.strategies.WorkerThreadIOStrategy;
 import org.glassfish.grizzly.utils.BufferOutputStream;
 import org.glassfish.grizzly.utils.DelayedExecutor;
 import org.glassfish.grizzly.utils.IdleTimeoutFilter;
@@ -104,6 +105,7 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -225,6 +227,10 @@ public void close() {
         try {
             connectionManager.destroy();
             clientTransport.stop();
+            final ExecutorService service = clientConfig.executorService();
+            if (service != null) {
+                service.shutdown();
+            }
             if (timeoutExecutor != null) {
                 timeoutExecutor.stop();
             }
@@ -277,8 +283,6 @@ protected <T> ListenableFuture<T> execute(final Connection c,
 
 
     protected void initializeTransport(AsyncHttpClientConfig clientConfig) {
-        
-
 
         final FilterChainBuilder fcb = FilterChainBuilder.stateless();
         fcb.add(new AsyncHttpClientTransportFilter());
@@ -354,7 +358,7 @@ public void onTimeout(Connection connection) {
         }
         fcb.add(eventFilter);
         fcb.add(clientFilter);
-
+        
         GrizzlyAsyncHttpProviderConfig providerConfig =
                 (GrizzlyAsyncHttpProviderConfig) clientConfig.getAsyncHttpProviderConfig();
         if (providerConfig != null) {
@@ -363,10 +367,10 @@ public void onTimeout(Connection connection) {
             if (customizer != null) {
                 customizer.customize(clientTransport, fcb);
             } else {
-                clientTransport.setIOStrategy(SameThreadIOStrategy.getInstance());
+                doDefaultTransportConfig();
             }
         } else {
-            clientTransport.setIOStrategy(SameThreadIOStrategy.getInstance());
+            doDefaultTransportConfig();
         }
 
         clientTransport.setProcessor(fcb.build());
@@ -401,6 +405,16 @@ void touchConnection(final Connection c, final Request request) {
 
 
     // --------------------------------------------------------- Private Methods
+    
+    private void doDefaultTransportConfig() {
+        final ExecutorService service = clientConfig.executorService();
+        if (service != null) {
+            clientTransport.setIOStrategy(WorkerThreadIOStrategy.getInstance());
+            clientTransport.setWorkerThreadPool(service);
+        } else {
+            clientTransport.setIOStrategy(SameThreadIOStrategy.getInstance());
+        }
+    }
 
 
     private <T> CompletionHandler<WriteResult> createWriteCompletionHandler(final GrizzlyResponseFuture<T> future) {