On 12/01/2015 09:35 PM, [email protected] wrote:
Author: astitcher
Date: Tue Dec 1 21:35:41 2015
New Revision: 1717539
URL: http://svn.apache.org/viewvc?rev=1717539&view=rev
Log:
QPID-6924: Add in a case for PN_INVALID, but carry on doing nothing if we have
no data
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp?rev=1717539&r1=1717538&r2=1717539&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp Tue Dec 1 21:35:41
2015
@@ -24,9 +24,7 @@
#include "qpid/amqp/MapBuilder.h"
#include "qpid/log/Statement.h"
#include <string>
-extern "C" {
#include <proton/engine.h>
-}
namespace qpid {
namespace broker {
@@ -148,6 +146,8 @@ void DataReader::readOne(pn_data_t* data
case PN_MAP:
readMap(data, described ? &descriptor : 0);
break;
+ case PN_INVALID:
+ break;
}
if (described) pn_data_exit(data);
}
I believe this change makes the qpid-cpp code dependent on the as yet
unreleased proton trunk. I think we probably need to make the inclusion
conditional on a particular proton version.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
