From d8db9228b577c28b5f8f8f0a21b3642065c10549 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Tue, 13 Mar 2007 20:16:58 +0000
Subject: Merged revisions 496665 via svnmerge from
 https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid

........
  r496665 | gsim | 2007-01-16 07:00:22 -0500 (Tue, 16 Jan 2007) | 3 lines

  Some basic additional error logging of framing errors.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@517851 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/lib/common/framing/Value.cpp            |  5 ++++-
 cpp/lib/common/sys/apr/LFSessionContext.cpp | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'cpp/lib')

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 43fc3de3dd..ff7a0107b6 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;
-- 
cgit v1.2.1