Revert botched commit of NUTCH-2267
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/fda3e148 Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/fda3e148 Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/fda3e148 Branch: refs/heads/master Commit: fda3e148bcf01d8b0020d4550127fa30aea8aab6 Parents: 9ce097b Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Authored: Sat Jul 16 14:44:27 2016 -0700 Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Committed: Sat Jul 16 14:44:27 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/nutch/indexwriter/solr/SolrUtils.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nutch/blob/fda3e148/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java ---------------------------------------------------------------------- diff --git a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java index d70bc62..eec0080 100644 --- a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java +++ b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrUtils.java @@ -22,7 +22,6 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.mapred.JobConf; -import org.apache.http.impl.client.SystemDefaultHttpClient; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.impl.CloudSolrClient; @@ -32,7 +31,6 @@ import java.net.MalformedURLException; public class SolrUtils { public static Logger LOG = LoggerFactory.getLogger(SolrUtils.class); - private static HttpClient HTTP_CLIENT = new SystemDefaultHttpClient(); /** * @@ -53,7 +51,7 @@ public class SolrUtils { } } else { for (int i = 0; i < urls.length; i++) { - SolrClient sc = new HttpSolrClient(urls[i], HTTP_CLIENT); + SolrClient sc = new HttpSolrClient(urls[i]); solrClients.add(sc); } } @@ -62,14 +60,14 @@ public class SolrUtils { } public static CloudSolrClient getCloudSolrClient(String url) throws MalformedURLException { - CloudSolrClient sc = new CloudSolrClient(url.replace('|', ','), HTTP_CLIENT); + CloudSolrClient sc = new CloudSolrClient(url.replace('|', ',')); sc.setParallelUpdates(true); sc.connect(); return sc; } public static SolrClient getHttpSolrClient(String url) throws MalformedURLException { - SolrClient sc =new HttpSolrClient(url, HTTP_CLIENT); + SolrClient sc =new HttpSolrClient(url); return sc; }