From 136a2c71908c32ad2613733ff0c948c885936c27 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Fri, 20 Dec 2013 14:56:07 +0000 Subject: [PATCH] SOLR-5562: ConcurrentUpdateSolrServer constructor ignores supplied httpclient. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1552691 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 3 +++ .../solr/client/solrj/impl/ConcurrentUpdateSolrServer.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 133fed69085..50c0ee32b30 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -210,6 +210,9 @@ Bug Fixes * SOLR-5543: Core swaps resulted in duplicate core entries in solr.xml when using solr.xml persistence. (Bill Bell, Alan Woodward) + +* SOLR-5562: ConcurrentUpdateSolrServer constructor ignores supplied httpclient. + (Kyle Halliday via Mark Miller) Optimizations ---------------------- diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java index 34cf01e729b..c322e987386 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java @@ -101,7 +101,7 @@ public class ConcurrentUpdateSolrServer extends SolrServer { public ConcurrentUpdateSolrServer(String solrServerUrl, HttpClient client, int queueSize, int threadCount) { - this(solrServerUrl, null, queueSize, threadCount, Executors.newCachedThreadPool( + this(solrServerUrl, client, queueSize, threadCount, Executors.newCachedThreadPool( new SolrjNamedThreadFactory("concurrentUpdateScheduler"))); shutdownExecutor = true; }