Merge pull request #21580 from vespa-engine/arnej/verify-namecollision-fails

struct/document name collision fails

1 files changed, 8 insertions, 3 deletions

diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
index be2c182426e..9325e374daa 100644
--- a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
+++ b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
@@ -61,8 +61,13 @@ public class DocumentTypeManagerConfigurer implements ConfigSubscriber.SingleSub
 
     public ConfigSubscriber configure(String configId) {
         ConfigSubscriber subscriber = new ConfigSubscriber();
-        subscriber.subscribe(this, DocumentmanagerConfig.class, configId);
-        return subscriber;
+        try {
+            subscriber.subscribe(this, DocumentmanagerConfig.class, configId);
+            return subscriber;
+        } catch (RuntimeException e) {
+            subscriber.close();
+            throw e;
+        }
     }
 
     /** One-shot configuration; should be called on a newly constructed manager */
@@ -264,7 +269,7 @@ public class DocumentTypeManagerConfigurer implements ConfigSubscriber.SingleSub
                 var old = configMap.put(id, dataTypeConfig);
                 if (old != null) {
                     throw new IllegalArgumentException
-                        ("Multiple configs for id "+id+" first: "+old+" second: "+dataTypeConfig);
+                        ("Multiple configs for id "+id+" first:\n"+old+"\nsecond:\n"+dataTypeConfig);
                 }
             }
         }