commit 072ab99709f58e0cd304f43bdff1096857d287ed
author Karl Wright <kwright@apache.org> Thu Mar 07 21:29:23 2013 +0000
committer Karl Wright <kwright@apache.org> Thu Mar 07 21:29:23 2013 +0000
tree ad156932a635ead4c88a1f067024d601bc747ea9
parent 887ac3c4dea7b1d5e6bcf0ea221831bba8ad1b33

Fix build errors; it appears that Solr is still using an old version of HttpClient

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/solr-4.x/trunk@1454107 13f79535-47bb-0310-9956-ffa450edef68

mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java

diff --git a/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java b/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
index fc4dd86..32a6998 100644
--- a/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
+++ b/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
@@ -49,7 +49,7 @@
 import org.apache.http.util.EntityUtils;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.DefaultRedirectStrategy;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.slf4j.*;
 
 import java.io.*;
@@ -88,7 +88,7 @@
   int connectionTimeOut;
   int socketTimeOut;
   Integer connectionManagerSynchronizer = new Integer(0);
-  PoolingClientConnectionManager httpConnectionManager = null;
+  ThreadSafeClientConnManager httpConnectionManager = null;
   DefaultHttpClient client = null;
   int poolSize;
   
@@ -128,7 +128,7 @@
       if (client == null)
       {
         // Initialize the connection pool
-        httpConnectionManager = new PoolingClientConnectionManager();
+        httpConnectionManager = new ThreadSafeClientConnManager();
         httpConnectionManager.setMaxTotal(poolSize);
         httpConnectionManager.setDefaultMaxPerRoute(poolSize);
         BasicHttpParams params = new BasicHttpParams();

mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java

diff --git a/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java b/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
index 5565393..2b119a0 100644
--- a/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
+++ b/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
@@ -41,7 +41,7 @@
 import org.apache.http.util.EntityUtils;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.DefaultRedirectStrategy;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.slf4j.*;
 
 import java.io.*;
@@ -80,7 +80,7 @@
   String fieldDenyShare = null;
   int connectionTimeOut;
   int socketTimeOut;
-  PoolingClientConnectionManager httpConnectionManager = null;
+  ThreadSafeClientConnManager httpConnectionManager = null;
   DefaultHttpClient client = null;
   int poolSize;
   
@@ -117,7 +117,7 @@
     poolSize = (connectionPoolSize==null)?50:connectionPoolSize.intValue();
 
     // Initialize the connection pool
-    httpConnectionManager = new PoolingClientConnectionManager();
+    httpConnectionManager = new ThreadSafeClientConnManager();
     httpConnectionManager.setMaxTotal(poolSize);
     httpConnectionManager.setDefaultMaxPerRoute(poolSize);
     BasicHttpParams params = new BasicHttpParams();