Default support for arbitrary DOM objects.

[shibboleth/xmltooling.git] / xmltooling / io / AbstractXMLObjectMarshaller.cpp

diff --git a/xmltooling/io/AbstractXMLObjectMarshaller.cpp b/xmltooling/io/AbstractXMLObjectMarshaller.cpp
index 7fd4e50..1457d4b 100644 (file)
--- a/xmltooling/io/AbstractXMLObjectMarshaller.cpp
+++ b/xmltooling/io/AbstractXMLObjectMarshaller.cpp
@@ -192,22 +192,11 @@ public:
 \r
         const Marshaller* marshaller = Marshaller::getMarshaller(obj);\r
         if (!marshaller) {\r
-            if (XMLToolingConfig::getConfig().ignoreUnknownElements) {\r
-                marshaller=Marshaller::getDefaultMarshaller();\r
-                if (marshaller)\r
-                    XT_log.debug("using default marshaller");\r
-                else {\r
-                    XT_log.error(\r
-                        "no default unmarshaller installed, unknown child object: %s",\r
-                        obj->getElementQName().toString().c_str()\r
-                        );\r
-                    throw MarshallingException("Marshaller found unknown child element, but no default marshaller was found.");\r
-                }\r
-            }\r
-            else {\r
-                XT_log.error("unknown child object: %s", obj->getElementQName().toString().c_str());\r
-                throw UnknownElementException("Marshaller found unknown child object.");\r
-            }\r
+            XT_log.error(\r
+                "no default unmarshaller installed, unknown child object: %s",\r
+                obj->getElementQName().toString().c_str()\r
+                );\r
+            throw MarshallingException("Marshaller found unknown child element, but no default marshaller was found.");\r
         }\r
         element->appendChild(marshaller->marshall(obj, element->getOwnerDocument()));\r
     }\r