Author: kwright
Date: Mon Feb 10 13:25:08 2014
New Revision: 1566617
URL: http://svn.apache.org/r1566617
Log:
Pull up changes for CONNECTORS-876 from trunk.
Modified:
manifoldcf/branches/release-1.5-branch/ (props changed)
manifoldcf/branches/release-1.5-branch/CHANGES.txt
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1563897
Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1566617&r1=1566616&r2=1566617&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Mon Feb 10 13:25:08 2014
@@ -4,6 +4,9 @@ $Id$
======================= Release 1.5.1 =====================
+CONNECTORS-876: Solr indexing exception reports now include the document URI.
+(David Morana, Karl Wright)
+
CONNECTORS-875: Handle ArrayIndexOutOfBounds and NumberFormatException
from LAPI as Livelink runtime errors.
(David Morana, Karl Wright)
Modified:
manifoldcf/branches/release-1.5-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.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1566617&r1=1566616&r2=1566617&view=diff
==============================================================================
---
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
(original)
+++
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Mon Feb 10 13:25:08 2014
@@ -560,22 +560,22 @@ public class HttpPoster
}
catch (SolrServerException e)
{
- handleSolrServerException(e, "indexing");
+ handleSolrServerException(e, "indexing "+documentURI);
return false;
}
catch (SolrException e)
{
- handleSolrException(e, "indexing");
+ handleSolrException(e, "indexing "+documentURI);
return false;
}
catch (RuntimeException e)
{
- handleRuntimeException(e, "indexing");
+ handleRuntimeException(e, "indexing "+documentURI);
return false;
}
catch (IOException ioe)
{
- handleIOException(ioe, "indexing");
+ handleIOException(ioe, "indexing "+documentURI);
return false;
}