You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/03/07 22:29:23 UTC
svn commit: r1454107 - in /manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf: ManifoldCFQParserPlugin.java ManifoldCFSearchComponent.java

Author: kwright
Date: Thu Mar  7 21:29:23 2013
New Revision: 1454107

URL: http://svn.apache.org/r1454107
Log:
Fix build errors; it appears that Solr is still using an old version of HttpClient

Modified:
    manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
    manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java

Modified: manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1454107&r1=1454106&r2=1454107&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java (original)
+++ manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java Thu Mar  7 21:29:23 2013
@@ -49,7 +49,7 @@ import org.apache.http.params.CoreConnec
 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 @@ public class ManifoldCFQParserPlugin ext
   int connectionTimeOut;
   int socketTimeOut;
   Integer connectionManagerSynchronizer = new Integer(0);
-  PoolingClientConnectionManager httpConnectionManager = null;
+  ThreadSafeClientConnManager httpConnectionManager = null;
   DefaultHttpClient client = null;
   int poolSize;
   
@@ -128,7 +128,7 @@ public class ManifoldCFQParserPlugin ext
       if (client == null)
       {
         // Initialize the connection pool
-        httpConnectionManager = new PoolingClientConnectionManager();
+        httpConnectionManager = new ThreadSafeClientConnManager();
         httpConnectionManager.setMaxTotal(poolSize);
         httpConnectionManager.setDefaultMaxPerRoute(poolSize);
         BasicHttpParams params = new BasicHttpParams();

Modified: manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?rev=1454107&r1=1454106&r2=1454107&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java (original)
+++ manifoldcf/integration/solr-4.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java Thu Mar  7 21:29:23 2013
@@ -41,7 +41,7 @@ import org.apache.http.params.CoreConnec
 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 @@ public class ManifoldCFSearchComponent e
   String fieldDenyShare = null;
   int connectionTimeOut;
   int socketTimeOut;
-  PoolingClientConnectionManager httpConnectionManager = null;
+  ThreadSafeClientConnManager httpConnectionManager = null;
   DefaultHttpClient client = null;
   int poolSize;
   
@@ -117,7 +117,7 @@ public class ManifoldCFSearchComponent e
     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();