1 files changed, 12 insertions, 7 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/HttpClient.java b/src/main/java/io/trygvis/esper/testing/HttpClient.java
index d9adc8d..79be578 100755
--- a/src/main/java/io/trygvis/esper/testing/HttpClient.java
+++ b/src/main/java/io/trygvis/esper/testing/HttpClient.java
@@ -1,9 +1,13 @@
 package io.trygvis.esper.testing;
 
 import static java.lang.System.*;
+
+import org.apache.http.conn.scheme.*;
+import org.apache.http.impl.client.*;
+import org.apache.http.impl.conn.tsccm.*;
+import org.apache.http.params.*;
 import org.codehaus.httpcache4j.*;
 import org.codehaus.httpcache4j.cache.*;
-import org.codehaus.httpcache4j.client.*;
 import org.codehaus.httpcache4j.resolver.*;
 
 import java.io.*;
@@ -11,11 +15,12 @@ import java.io.*;
 public class HttpClient {
 
     public static HTTPCache createHttpClient(Config config) {
-        return new HTTPCache(new MemoryCacheStorage(), createResponseResolver(config));
-    }
-
-    private static ResponseResolver createResponseResolver(final Config config) {
-        ResponseResolver responseResolver = HTTPClientResponseResolver.createMultithreadedInstance();
+        SchemeRegistry schemeRegistry = new SchemeRegistry();
+        schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
+        schemeRegistry.register(new Scheme("https", new EasySSLSocketFactory(), 443));
+        BasicHttpParams params = new BasicHttpParams();
+        ThreadSafeClientConnManager cm = new ThreadSafeClientConnManager(params, schemeRegistry);
+        ResponseResolver responseResolver = new HTTPClientResponseResolver(new DefaultHttpClient(cm, new BasicHttpParams()));
 
         if (config.gitoriousSessionValue.isSome()) {
             responseResolver = new GitoriousResponseResolver(config.gitoriousSessionValue.some(), responseResolver);
@@ -23,7 +28,7 @@ public class HttpClient {
 
         responseResolver = new TimingResponseResolver(responseResolver);
 
-        return responseResolver;
+        return new HTTPCache(new MemoryCacheStorage(), responseResolver);
     }
 
     private static class TimingResponseResolver implements ResponseResolver {