Author: jmssiera
Date: Tue Dec 14 16:11:15 2021
New Revision: 1895958
URL: http://svn.apache.org/viewvc?rev=1895958&view=rev
Log:
Fix CONNECTORS-1686
Modified:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java
Modified:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java?rev=1895958&r1=1895957&r2=1895958&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java
(original)
+++
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java
Tue Dec 14 16:11:15 2021
@@ -437,7 +437,14 @@ public class SolrIngesterConnector exten
query.set(CursorMarkParams.CURSOR_MARK_PARAM, cursorMark);
QueryResponse response;
response = httpSolrClient.query(collection, query);
- final String nextCursorMark = response.getNextCursorMark();
+ String nextCursorMark = cursorMark;
+ try {
+ nextCursorMark = response.getNextCursorMark();
+ } catch (Exception e) {
+ // Something wrong with the response, break
+ Logging.connectors.warn("SolrIngester: the type of the reponse
getnextcursormark is not recognized as a String");
+ break;
+ }
final SolrDocumentList documents = response.getResults();
for (final SolrDocument document : documents) {
@@ -545,7 +552,14 @@ public class SolrIngesterConnector exten
query.setFields(idFieldName, versionField);
query.addFilterQuery(idFieldName + ":(" + documentIdentifiersString +
")");
- String cursorMark = CursorMarkParams.CURSOR_MARK_START;
+ String nextCursorMark = cursorMark;
+ try {
+ nextCursorMark = response.getNextCursorMark();
+ } catch (Exception e) {
+ // Something wrong with the response, break
+ Logging.connectors.warn("SolrIngester: the type of the reponse
getnextcursormark is not recognized as a String");
+ break;
+ }
boolean done = false;
while (!done) {
query.set(CursorMarkParams.CURSOR_MARK_PARAM, cursorMark);
@@ -610,10 +624,15 @@ public class SolrIngesterConnector exten
QueryResponse response;
SolrDocumentList documents = null;
-
response = httpSolrClient.query(collection, query);
-
- final String nextCursorMark = response.getNextCursorMark();
+ String nextCursorMark = cursorMark;
+ try {
+ nextCursorMark = response.getNextCursorMark();
+ } catch (Exception e) {
+ // Something wrong with the response, break
+ Logging.connectors.warn("SolrIngester: the type of the reponse
getnextcursormark is not recognized as a String");
+ break;
+ }
documents = response.getResults();
InputStream is = null;
for (final SolrDocument document : documents) {
