summaryrefslogtreecommitdiffstats
path: root/document/src/main/java
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2022-03-07 14:55:03 +0000
committerArne H Juul <arnej@yahooinc.com>2022-03-07 14:58:45 +0000
commit23db7be16bf266f478f773654137cac43c162fdd (patch)
treeb0214f98ed195a3e8f89279af4120217db17c0c6 /document/src/main/java
parentdd8ce8c64faaf340eea43e09115c462ad923746b (diff)
struct/document name collision fails
* the unit tests claims that this works, and seems to verify that. But the generated config isn't valid.
Diffstat (limited to 'document/src/main/java')
-rw-r--r--document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java11
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);
}
}
}