Next integration phase, metadata and trust conversion.

[shibboleth/cpp-sp.git] / shibsp / SocketListener.cpp

diff --git a/shibsp/SocketListener.cpp b/shibsp/SocketListener.cpp
index baab25f..cdec2ce 100644 (file)
--- a/shibsp/SocketListener.cpp
+++ b/shibsp/SocketListener.cpp
@@ -482,10 +482,15 @@ bool ServerThread::job()
         // Dispatch the message.
         out=m_listener->receive(in);
     }
-    catch (XMLToolingException &e) {
+    catch (XMLToolingException& e) {
         log.error("error processing incoming message: %s", e.what());
         out=DDF("exception").string(e.toString().c_str());
     }
+    catch (exception& e) {
+        log.error("error processing incoming message: %s", e.what());
+        ListenerException ex(e.what());
+        out=DDF("exception").string(ex.toString().c_str());
+    }
 #ifndef _DEBUG
     catch (...) {
         log.error("unexpected error processing incoming message");