Some basic additional error logging of framing errors.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496665 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 13 insertions, 4 deletions

diff --git a/cpp/lib/common/framing/Value.cpp b/cpp/lib/common/framing/Value.cpp
index fc087043e5..d193286636 100644
--- a/cpp/lib/common/framing/Value.cpp
+++ b/cpp/lib/common/framing/Value.cpp
@@ -22,6 +22,7 @@
 #include <Buffer.h>
 #include <FieldTable.h>
 #include <QpidError.h>
+#include <sstream>
 
 namespace qpid {
 namespace framing {
@@ -85,7 +86,9 @@ std::auto_ptr<Value> Value::decode_value(Buffer& buffer)
         value.reset(new FieldTableValue());
 	break;
       default:
-	THROW_QPID_ERROR(FRAMING_ERROR, "Unknown field table value type");
+        std::stringstream out;
+        out << "Unknown field table value type: " << type;
+	THROW_QPID_ERROR(FRAMING_ERROR, out.str());
     }
     value->decode(buffer);
     return value;
diff --git a/cpp/lib/common/sys/apr/LFSessionContext.cpp b/cpp/lib/common/sys/apr/LFSessionContext.cpp
index 7fb8d5a91b..f0804f6c72 100644
--- a/cpp/lib/common/sys/apr/LFSessionContext.cpp
+++ b/cpp/lib/common/sys/apr/LFSessionContext.cpp
@@ -58,9 +58,15 @@ void LFSessionContext::read(){
     in.flip();
     if(initiated){
         AMQFrame frame;
-        while(frame.decode(in)){
-            if(debug) log("RECV", &frame);
-            handler->received(&frame);
+        try{
+            while(frame.decode(in)){
+                if(debug) log("RECV", &frame);
+                handler->received(&frame);
+            }
+        }catch(QpidError error){
+            std::cout << "Error [" << error.code << "] " << error.msg
+                      << " (" << error.location.file << ":" << error.location.line
+                      << ")" << std::endl;
         }
     }else{
         ProtocolInitiation protocolInit;