commit d5fdb849852725bff7df991e73221186254c4d76
author Karl Wright <kwright@apache.org> Sun May 03 10:39:47 2015 +0000
committer Karl Wright <kwright@apache.org> Sun May 03 10:39:47 2015 +0000
tree e750404296cf59c494329741f3a84f2eb269dcd2
parent 24a7c17503a1ec40a02f063555d71b6006033e71

Fix for CONNECTORS-1194

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

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index 71f31cf..2b6efd1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,9 @@
 
 ======================= 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)
 

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

diff --git a/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java b/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
index 0972e43..53a16da 100644
--- a/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
+++ b/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
@@ -135,14 +135,13 @@
         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());

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

diff --git a/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java b/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
index 991b454..4a9a854 100644
--- a/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
+++ b/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
@@ -139,14 +139,13 @@
     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());