You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/03/13 21:16:59 UTC
svn commit: r517851 - in /incubator/qpid/branches/qpid.0-9: ./
cpp/lib/common/framing/Value.cpp cpp/lib/common/sys/apr/LFSessionContext.cpp
Author: aconway
Date: Tue Mar 13 13:16:58 2007
New Revision: 517851
URL: http://svn.apache.org/viewvc?view=rev&rev=517851
Log:
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.
........
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp
incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 13 13:16:58 2007
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317
+/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp?view=diff&rev=517851&r1=517850&r2=517851
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp Tue Mar 13 13:16:58 2007
@@ -22,6 +22,7 @@
#include <Buffer.h>
#include <FieldTable.h>
#include <QpidError.h>
+#include <sstream>
namespace qpid {
namespace framing {
@@ -85,7 +86,9 @@
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;
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp?view=diff&rev=517851&r1=517850&r2=517851
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp Tue Mar 13 13:16:58 2007
@@ -58,9 +58,15 @@
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;