svn commit: r1717583 - in /manifoldcf/trunk: CHANGES.txt connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java

[kw...@apache.org]

Author: kwright
Date: Wed Dec  2 08:23:18 2015
New Revision: 1717583

URL: http://svn.apache.org/viewvc?rev=1717583&view=rev
Log:
Fix for CONNECTORS-1261.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1717583&r1=1717582&r2=1717583&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Dec  2 08:23:18 2015
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.3-dev =====================
 
+CONNECTORS-1261: Supply commit-within argument for /update
+handler in Solr connector.
+(Karl Wright, Shinichiro Abe, Adrian Conlon)
+
 CONNECTORS-1251: Confluence connector encoding issue.
 (Karl Wright, Jens Grassel)
 

Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1717583&r1=1717582&r2=1717583&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Wed Dec  2 08:23:18 2015
@@ -282,8 +282,17 @@ public class HttpPoster
   public void shutdown()
   {
     if (solrServer != null)
-      solrServer.shutdown();
-    solrServer = null;
+    {
+      try
+      {
+        solrServer.close();
+      }
+      catch (IOException ioe)
+      {
+        // Eat this exception
+      }
+      solrServer = null;
+    }
     if (connectionManager != null)
       connectionManager.shutdown();
     connectionManager = null;
@@ -913,7 +922,14 @@ public class HttpPoster
             }
             else
             {
-              response = solrServer.add( currentSolrDoc );
+              if (commitWithin != null)
+              {
+                response = solrServer.add( currentSolrDoc, Integer.parseInt(commitWithin) );
+              }
+              else
+              {
+                response = solrServer.add( currentSolrDoc );
+              }
             }
 
             // Successful completion