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 2015/05/03 12:39:48 UTC
svn commit: r1677381 - in /manifoldcf/integration/solr-5.x/trunk:
CHANGES.txt src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Author: kwright
Date: Sun May 3 10:39:47 2015
New Revision: 1677381
URL: http://svn.apache.org/r1677381
Log:
Fix for CONNECTORS-1194
Modified:
manifoldcf/integration/solr-5.x/trunk/CHANGES.txt
manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Modified: manifoldcf/integration/solr-5.x/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-5.x/trunk/CHANGES.txt?rev=1677381&r1=1677380&r2=1677381&view=diff
==============================================================================
--- manifoldcf/integration/solr-5.x/trunk/CHANGES.txt (original)
+++ manifoldcf/integration/solr-5.x/trunk/CHANGES.txt Sun May 3 10:39:47 2015
@@ -3,6 +3,9 @@ $Id$
======================= 2.2-dev ======================
+CONNECTORS-1194: Stale connection checks enabled.
+(Karl Wright)
+
CONNECTORS-1185: Make sure socket timeouts are actually honored in http connections.
(Ahmet Arslan)
Modified: manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1677381&r1=1677380&r2=1677381&view=diff
==============================================================================
--- manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java (original)
+++ manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java Sun May 3 10:39:47 2015
@@ -135,14 +135,13 @@ public class ManifoldCFQParserPlugin ext
RequestConfig.Builder requestBuilder = RequestConfig.custom()
.setCircularRedirectsAllowed(true)
.setSocketTimeout(socketTimeOut)
- .setStaleConnectionCheckEnabled(false)
+ .setStaleConnectionCheckEnabled(true)
.setExpectContinueEnabled(true)
.setConnectTimeout(connectionTimeOut)
.setConnectionRequestTimeout(socketTimeOut);
HttpClientBuilder clientBuilder = HttpClients.custom()
.setConnectionManager(httpConnectionManager)
- .setMaxConnTotal(1)
.disableAutomaticRetries()
.setDefaultRequestConfig(requestBuilder.build())
.setRedirectStrategy(new DefaultRedirectStrategy());
Modified: manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?rev=1677381&r1=1677380&r2=1677381&view=diff
==============================================================================
--- manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java (original)
+++ manifoldcf/integration/solr-5.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java Sun May 3 10:39:47 2015
@@ -139,14 +139,13 @@ public class ManifoldCFSearchComponent e
RequestConfig.Builder requestBuilder = RequestConfig.custom()
.setCircularRedirectsAllowed(true)
.setSocketTimeout(socketTimeOut)
- .setStaleConnectionCheckEnabled(false)
+ .setStaleConnectionCheckEnabled(true)
.setExpectContinueEnabled(true)
.setConnectTimeout(connectionTimeOut)
.setConnectionRequestTimeout(socketTimeOut);
HttpClientBuilder clientBuilder = HttpClients.custom()
.setConnectionManager(httpConnectionManager)
- .setMaxConnTotal(1)
.disableAutomaticRetries()
.setDefaultRequestConfig(requestBuilder.build())
.setRedirectStrategy(new DefaultRedirectStrategy());