Moved in request/response interfaces from opensaml.

[shibboleth/xmltooling.git] / xmltooling / exceptions.cpp

diff --git a/xmltooling/exceptions.cpp b/xmltooling/exceptions.cpp
index 3b37262..91f4ffa 100644 (file)
--- a/xmltooling/exceptions.cpp
+++ b/xmltooling/exceptions.cpp
@@ -231,21 +231,23 @@ string XMLToolingException::toString() const
 
 string XMLToolingException::toQueryString() const
 {
+    string q;
     const URLEncoder* enc = XMLToolingConfig::getConfig().getURLEncoder();
-    string q("type=");
-    q = q + enc->encode(getClassName()) + "&message=" + enc->encode(what());
-    for (map<string,string>::const_iterator i=m_params.begin(); i!=m_params.end(); i++)
-        q = q + '&' + i->first + '=' + enc->encode(i->second.c_str());
+    for (map<string,string>::const_iterator i=m_params.begin(); i!=m_params.end(); i++) {
+        if (!q.empty())
+            q += '&';
+        q = q + i->first + '=' + enc->encode(i->second.c_str());
+    }
     return q;
 }
 
 XMLToolingException* XMLToolingException::fromStream(std::istream& in)
 {
-    static const XMLCh exception[] = { chLatin_e, chLatin_x, chLatin_c, chLatin_e, chLatin_p, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull };
-    static const XMLCh message[] = { chLatin_m, chLatin_e, chLatin_s, chLatin_s, chLatin_a, chLatin_g, chLatin_e, chNull };
-    static const XMLCh name[] = { chLatin_n, chLatin_a, chLatin_m, chLatin_e, chNull };
-    static const XMLCh param[] = { chLatin_p, chLatin_a, chLatin_r, chLatin_a, chLatin_m, chNull };
-    static const XMLCh type[] = { chLatin_t, chLatin_y, chLatin_p, chLatin_e, chNull };
+    static const XMLCh exception[] =    UNICODE_LITERAL_9(e,x,c,e,p,t,i,o,n);
+    static const XMLCh message[] =      UNICODE_LITERAL_7(m,e,s,s,a,g,e);
+    static const XMLCh name[] =         UNICODE_LITERAL_4(n,a,m,e);
+    static const XMLCh param[] =        UNICODE_LITERAL_5(p,a,r,a,m);
+    static const XMLCh type[] =         UNICODE_LITERAL_4(t,y,p,e);
 
     DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);