You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by io...@apache.org on 2015/04/17 20:25:08 UTC
svn commit: r1674373 - in /manifoldcf/integration/solr-5.x/trunk:
CHANGES.txt README.txt
src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Author: iorixxx
Date: Fri Apr 17 18:25:08 2015
New Revision: 1674373
URL: http://svn.apache.org/r1674373
Log:
Fix for CONNECTORS-1185 and a typo in readme.
Modified:
manifoldcf/integration/solr-5.x/trunk/CHANGES.txt
manifoldcf/integration/solr-5.x/trunk/README.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=1674373&r1=1674372&r2=1674373&view=diff
==============================================================================
--- manifoldcf/integration/solr-5.x/trunk/CHANGES.txt (original)
+++ manifoldcf/integration/solr-5.x/trunk/CHANGES.txt Fri Apr 17 18:25:08 2015
@@ -3,6 +3,8 @@ $Id$
======================= 2.2-dev ======================
+CONNECTORS-1185: Make sure socket timeouts are actually honored in http connections.
+(Ahmet Arslan)
======================= Release 2.1 =====================
Modified: manifoldcf/integration/solr-5.x/trunk/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-5.x/trunk/README.txt?rev=1674373&r1=1674372&r2=1674373&view=diff
==============================================================================
--- manifoldcf/integration/solr-5.x/trunk/README.txt (original)
+++ manifoldcf/integration/solr-5.x/trunk/README.txt Fri Apr 17 18:25:08 2015
@@ -42,7 +42,7 @@ Instructions for Building Apache Manifol
The JAR package can be found in the target folder:
- target/apache-manifoldcf-solr5x-plugin-<VERSION>.jar where <VERSION> is the release version
+ target/apache-manifoldcf-solr-5.x-plugin-<VERSION>.jar where <VERSION> is the release version
Getting Started
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=1674373&r1=1674372&r2=1674373&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 Fri Apr 17 18:25:08 2015
@@ -127,6 +127,10 @@ public class ManifoldCFQParserPlugin ext
httpConnectionManager = new PoolingHttpClientConnectionManager();
httpConnectionManager.setMaxTotal(poolSize);
httpConnectionManager.setDefaultMaxPerRoute(poolSize);
+ httpConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
+ .setTcpNoDelay(true)
+ .setSoTimeout(socketTimeOut)
+ .build());
RequestConfig.Builder requestBuilder = RequestConfig.custom()
.setCircularRedirectsAllowed(true)
@@ -141,11 +145,8 @@ public class ManifoldCFQParserPlugin ext
.setMaxConnTotal(1)
.disableAutomaticRetries()
.setDefaultRequestConfig(requestBuilder.build())
- .setRedirectStrategy(new DefaultRedirectStrategy())
- .setDefaultSocketConfig(SocketConfig.custom()
- .setTcpNoDelay(true)
- .setSoTimeout(socketTimeOut)
- .build());
+ .setRedirectStrategy(new DefaultRedirectStrategy());
+
client = clientBuilder.build();
core.addCloseHook(new CloseHandler());
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=1674373&r1=1674372&r2=1674373&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 Fri Apr 17 18:25:08 2015
@@ -131,6 +131,10 @@ public class ManifoldCFSearchComponent e
httpConnectionManager = new PoolingHttpClientConnectionManager();
httpConnectionManager.setMaxTotal(poolSize);
httpConnectionManager.setDefaultMaxPerRoute(poolSize);
+ httpConnectionManager.setDefaultSocketConfig(SocketConfig.custom()
+ .setTcpNoDelay(true)
+ .setSoTimeout(socketTimeOut)
+ .build());
RequestConfig.Builder requestBuilder = RequestConfig.custom()
.setCircularRedirectsAllowed(true)
@@ -145,11 +149,7 @@ public class ManifoldCFSearchComponent e
.setMaxConnTotal(1)
.disableAutomaticRetries()
.setDefaultRequestConfig(requestBuilder.build())
- .setRedirectStrategy(new DefaultRedirectStrategy())
- .setDefaultSocketConfig(SocketConfig.custom()
- .setTcpNoDelay(true)
- .setSoTimeout(socketTimeOut)
- .build());
+ .setRedirectStrategy(new DefaultRedirectStrategy());
client = clientBuilder.build();