Author: kwright
Date: Wed Jan 23 19:59:21 2013
New Revision: 1437672
URL: http://svn.apache.org/viewvc?rev=1437672&view=rev
Log:
Pull up fix for CONNECTORS-621
Modified:
manifoldcf/branches/release-1.1-branch/ (props changed)
manifoldcf/branches/release-1.1-branch/CHANGES.txt
manifoldcf/branches/release-1.1-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Propchange: manifoldcf/branches/release-1.1-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1437614
Modified: manifoldcf/branches/release-1.1-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/CHANGES.txt?rev=1437672&r1=1437671&r2=1437672&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.1-branch/CHANGES.txt Wed Jan 23 19:59:21 2013
@@ -3,6 +3,10 @@ $Id$
======================= Release 1.1 =====================
+CONNECTORS-621: Solr connector commit logic needs to use specified
+update path.
+(Karl Wright)
+
CONNECTORS-620: It was possible for the JDBC Connector to leak
JDBC connections under some error conditions.
(Anthony Leonard, Karl Wright)
Modified:
manifoldcf/branches/release-1.1-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1437672&r1=1437671&r2=1437672&view=diff
==============================================================================
---
manifoldcf/branches/release-1.1-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
(original)
+++
manifoldcf/branches/release-1.1-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Wed Jan 23 19:59:21 2013
@@ -1032,7 +1032,9 @@ public class HttpPoster
try
{
// Do the operation!
- UpdateResponse response = solrServer.commit();
+ UpdateRequest updateRequest = new UpdateRequest(postUpdateAction +
"?commit=true");
+ UpdateResponse response = updateRequest.process(solrServer);
+ //UpdateResponse response = solrServer.commit();
}
catch (InterruptedIOException ioe)
{
