Revert "Replaced deprecated DefaultHttpClient."

Commit db58e6071f6bb57de006e6499c0a0c6a8c8e67bf has been reverted
due to build issue on RHEL/CentOS.

https://fedorahosted.org/pki/ticket/2531

1 files changed, 7 insertions, 3 deletions

diff --git a/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java
index 1c4917ce9..3b721304c 100644
--- a/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java
@@ -25,11 +25,11 @@ import java.security.MessageDigest;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.asn1.INTEGER;
@@ -126,8 +126,9 @@ public class OCSPProcessor {
 
         if (verbose) System.out.println("URL: " + url);
 
-        try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
+        HttpClient httpClient = new DefaultHttpClient();
 
+        try {
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             request.encode(os);
             byte[] requestData = os.toByteArray();
@@ -161,6 +162,9 @@ public class OCSPProcessor {
             } finally {
                 EntityUtils.consume(responseEntity);
             }
+
+        } finally {
+            httpClient.getConnectionManager().shutdown();
         }
     }
 }