Add tests and more error checking

1 files changed, 6 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/EmbedderConfigTransformer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/EmbedderConfigTransformer.java
index 82ce8070c29..068ed2ee11f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/EmbedderConfigTransformer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/EmbedderConfigTransformer.java
@@ -51,6 +51,10 @@ public class EmbedderConfigTransformer {
                 addConfigValue(child, config, deployState.isHosted());
             component.appendChild(config);
         }
+        else if ( ! XML.getChildren(embedder).isEmpty()) {
+            throw new IllegalArgumentException("Embedder '" + embedder.getAttribute("id") + "' does not specify " +
+                                               "a 'def' parameter so it cannot contain config values");
+        }
 
         return component;
     }
@@ -104,13 +108,9 @@ public class EmbedderConfigTransformer {
     }
 
     private static String embedderClassFrom(Element spec) {
-        if (spec.hasAttribute("class")) {
+        if (spec.hasAttribute("class"))
             return spec.getAttribute("class");
-        }
-        if (spec.hasAttribute("id")) {
-            return spec.getAttribute("id");
-        }
-        throw new IllegalArgumentException("An <embedder> element must have a 'class' or 'id' attribute");
+        return spec.getAttribute("id");
     }