[lucene-solr] branch jira/solr-14537 updated: SOLR-14537: Improve exception handling.

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch jira/solr-14537
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr-14537 by this push:
     new d880f00  SOLR-14537: Improve exception handling.
d880f00 is described below

commit d880f0019a462a4cfe986e427db752d9b35abb10
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Jun 18 17:43:08 2020 +0200

    SOLR-14537: Improve exception handling.
---
 .../src/java/org/apache/solr/handler/export/ExportWriter.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
index 52ed726..862e507 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
@@ -357,8 +357,14 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
 
     if (streamExpression != null) {
       streamContext.put(ExportBuffers.EXPORT_BUFFERS_KEY, buffers);
-      final TupleStream tupleStream = createTupleStream();
-      tupleStream.open();
+      final TupleStream tupleStream;
+      try {
+        tupleStream = createTupleStream();
+        tupleStream.open();
+      } catch (Exception e) {
+        buffers.getWriter().add((MapWriter) ew -> Tuple.EXCEPTION(e, true).writeMap(ew));
+        return;
+      }
       buffers.run(() -> {
         for (;;) {
           if (Thread.currentThread().isInterrupted()) {