From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 12 Feb 2015 19:29:44 +0000 (+0000)
Subject: Guard marshalling with exception handler.
X-Git-Tag: 1.5.4~7
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=commitdiff_plain;h=c48ad7c5d219c90bad9745c2b2c1d384ae9620f6

Guard marshalling with exception handler.
---

diff --git a/xmltooling/util/XMLHelper.cpp b/xmltooling/util/XMLHelper.cpp
index 88dccbe..a270de4 100644
--- a/xmltooling/util/XMLHelper.cpp
+++ b/xmltooling/util/XMLHelper.cpp
@@ -452,5 +452,11 @@ ostream& xmltooling::operator<<(ostream& ostr, const DOMNode& node)
 
 ostream& xmltooling::operator<<(ostream& ostr, const XMLObject& obj)
 {
-    return ostr << *(obj.marshall());
+    try {
+        return ostr << *(obj.marshall());
+    }
+    catch (DOMException& ex) {
+        auto_ptr_char msg(ex.getMessage());
+        throw XMLParserException(msg.get());
+    }
 }