Small tweaks to MinimalHttpClient

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1430867 13f79535-47bb-0310-9956-ffa450edef68
jillesvangurp · Jan 9, 2013 · 40bf945 · 40bf945
1 parent aa92e0e
commit 40bf945
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java b/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java
@@ -79,12 +79,6 @@ public MinimalHttpClient(
         this.params = new BasicHttpParams();
     }
 
-    private HttpClientContext setupContext(final HttpContext localContext) {
-        HttpClientContext context = HttpClientContext.adapt(
-                localContext != null ? localContext : new BasicHttpContext());
-        return context;
-    }
-
     @Override
     protected CloseableHttpResponse doExecute(
             final HttpHost target,
@@ -98,20 +92,16 @@ protected CloseableHttpResponse doExecute(
         }
         try {
             HttpRequestWrapper wrapper = HttpRequestWrapper.wrap(request);
-            HttpClientContext localcontext = setupContext(context);
+            HttpClientContext localcontext = HttpClientContext.adapt(
+                context != null ? context : new BasicHttpContext());
             HttpRoute route = new HttpRoute(target);
             RequestConfig config = null;
             if (request instanceof Configurable) {
                 config = ((Configurable) request).getConfig();
             }
-            if (config == null) {
-                config = RequestConfig.DEFAULT;
-            }
-            if (config.getProxy() != null) {
-                throw new ClientProtocolException("Minimal HttpClient does not support" +
-                " request execution via proxy");
+            if (config != null) {
+                localcontext.setRequestConfig(config);
             }
-            localcontext.setRequestConfig(config);
             return this.requestExecutor.execute(route, wrapper, localcontext, execAware);
         } catch (HttpException httpException) {
             throw new ClientProtocolException(httpException);