Print doc id when failing to create concrete documents for processing

2 files changed, 7 insertions, 1 deletions

diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
index 180173789ae..1836f25f8d2 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
@@ -40,6 +40,7 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
 
     private final static Logger log = Logger.getLogger(MbusRequestContext.class.getName());
     private final static CopyOnWriteHashMap<String, URI> uriCache = new CopyOnWriteHashMap<>();
+
     private final AtomicBoolean deserialized = new AtomicBoolean(false);
     private final AtomicBoolean responded = new AtomicBoolean(false);
     private final ProcessingFactory processingFactory;
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java
index 030f95e380b..41d7f7920ca 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java
@@ -81,7 +81,12 @@ class ProcessingFactory {
             log.fine(() -> "Unable to get document factory component '" + componentId + "' from document factory registry.");
             return document;
         }
-        return cdf.getDocumentCopy(document.getDataType().getName(), document, document.getId());
+        try {
+            return cdf.getDocumentCopy(document.getDataType().getName(), document, document.getId());
+        }
+        catch (RuntimeException e) {
+            throw new IllegalArgumentException("error in document with id '" + document.getId() + "'", e);
+        }
     }
 
     private ContainerDocumentConfig.Doctype getDocumentConfig(String name) {