From 087fbac7d2ec28d6d881f4763a4ec4a06e9130f1 Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Fri, 9 Aug 2013 20:11:34 +0000
Subject: [PATCH] Removed reference to o.a.http.impl.client package from
 o.a.http.client.utils; fixed OSGi import / export warnings

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1512474 13f79535-47bb-0310-9956-ffa450edef68
---
 httpclient-osgi/pom.xml                       |  2 +
 .../http/client/utils/HttpClientUtils.java    | 46 ++++---------------
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/httpclient-osgi/pom.xml b/httpclient-osgi/pom.xml
index 2fbc17d6b..6299d769f 100644
--- a/httpclient-osgi/pom.xml
+++ b/httpclient-osgi/pom.xml
@@ -121,6 +121,7 @@
             org.apache.http.impl.auth.*;version=${project.version},
             org.apache.http.impl.cookie.*;version=${project.version},
             org.apache.http.impl.conn.*;version=${project.version},
+            org.apache.http.impl.execchain.*;version=${project.version}
             org.apache.http.impl.client.*;version=${project.version}
             org.apache.http.osgi.services;version=${project.version}
             </_exportcontents>
@@ -136,6 +137,7 @@
             org.osgi.service.cm,
             org.apache.commons.logging;version=${commons-logging.version},
             org.apache.http;version=${httpcore.version},
+            org.apache.http.config;version=${httpcore.version},
             org.apache.http.concurrent;version=${httpcore.version},
             org.apache.http.entity;version=${httpcore.version},
             org.apache.http.io;version=${httpcore.version},
diff --git a/httpclient/src/main/java/org/apache/http/client/utils/HttpClientUtils.java b/httpclient/src/main/java/org/apache/http/client/utils/HttpClientUtils.java
index 3b23a59f2..fcbb3e692 100644
--- a/httpclient/src/main/java/org/apache/http/client/utils/HttpClientUtils.java
+++ b/httpclient/src/main/java/org/apache/http/client/utils/HttpClientUtils.java
@@ -26,13 +26,13 @@
  */
 package org.apache.http.client.utils;
 
+import java.io.Closeable;
 import java.io.IOException;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 
 /**
@@ -109,7 +109,7 @@ public static void closeQuietly(final CloseableHttpResponse response) {
                 } finally {
                     response.close();
                 }
-            } catch (final IOException ex) {
+            } catch (final IOException ignore) {
             }
         }
     }
@@ -121,9 +121,9 @@ public static void closeQuietly(final CloseableHttpResponse response) {
      * Example Code:
      *
      * <pre>
-     * HttpClient httpClient = null;
+     * HttpClient httpClient = HttpClients.createDefault();
      * try {
-     *   httpClient = new DefaultHttpClient(...);
+     *   httpClient.execute(request);
      * } catch (Exception e) {
      *   // error handling
      * } finally {
@@ -134,42 +134,14 @@ public static void closeQuietly(final CloseableHttpResponse response) {
      * @param httpClient
      *            the HttpClient to close, may be null or already closed.
      * @since 4.2
-     *
-     * @deprecated (4.3) do not use.
      */
-    @Deprecated
     public static void closeQuietly(final HttpClient httpClient) {
         if (httpClient != null) {
-            httpClient.getConnectionManager().shutdown();
-        }
-    }
-
-    /**
-     * Unconditionally close a httpClient. Shuts down the underlying connection
-     * manager and releases the resources.
-     * <p>
-     * Example Code:
-     *
-     * <pre>
-     * CloseableHttpClient httpClient = HttpClients.createDefault();
-     * try {
-     *   ...
-     * } catch (Exception e) {
-     *   // error handling
-     * } finally {
-     *   HttpClientUtils.closeQuietly(httpClient);
-     * }
-     * </pre>
-     *
-     * @param httpClient
-     *            the HttpClient to close, may be null or already closed.
-     * @since 4.3
-     */
-    public static void closeQuietly(final CloseableHttpClient httpClient) {
-        if (httpClient != null) {
-            try {
-                httpClient.close();
-            } catch (final IOException ex) {
+            if (httpClient instanceof Closeable) {
+                try {
+                    ((Closeable) httpClient).close();
+                } catch (final IOException ignore) {
+                }
             }
         }
     }