Author: gsim
Date: Thu Jul 11 11:49:27 2013
New Revision: 1502193
URL: http://svn.apache.org/r1502193
Log:
QPID-4986: ensure correct handler is called for message-id typed properties
Modified:
qpid/trunk/qpid/cpp/src/qpid/amqp/MessageReader.cpp
qpid/trunk/qpid/cpp/src/tests/qpid-receive.cpp
qpid/trunk/qpid/cpp/src/tests/qpid-send.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp/MessageReader.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp/MessageReader.cpp?rev=1502193&r1=1502192&r2=1502193&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp/MessageReader.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp/MessageReader.cpp Thu Jul 11 11:49:27 2013
@@ -132,7 +132,7 @@ void MessageReader::PropertiesReader::on
if (index == MESSAGE_ID) {
parent.onMessageId(v, qpid::types::VAR_UUID);
} else if (index == CORRELATION_ID) {
- parent.onCorrelationId(v);
+ parent.onCorrelationId(v, qpid::types::VAR_UUID);
} else {
QPID_LOG(warning, "Unexpected message format, got uuid at index " <<
index << " of properties");
}
@@ -154,7 +154,7 @@ void MessageReader::PropertiesReader::on
if (index == MESSAGE_ID) {
parent.onMessageId(v, qpid::types::VAR_STRING);
} else if (index == CORRELATION_ID) {
- parent.onCorrelationId(v);
+ parent.onCorrelationId(v, qpid::types::VAR_STRING);
} else if (index == USER_ID) {
parent.onUserId(v);
} else {
@@ -165,9 +165,9 @@ void MessageReader::PropertiesReader::on
void MessageReader::PropertiesReader::onString(const CharSequence& v, const
Descriptor*) // message-id, correlation-id, group-id, reply-to-group-id,
subject, to, reply-to
{
if (index == MESSAGE_ID) {
- parent.onMessageId(v);
+ parent.onMessageId(v, qpid::types::VAR_STRING);
} else if (index == CORRELATION_ID) {
- parent.onCorrelationId(v);
+ parent.onCorrelationId(v, qpid::types::VAR_STRING);
} else if (index == GROUP_ID) {
parent.onGroupId(v);
} else if (index == REPLY_TO_GROUP_ID) {
@@ -219,123 +219,6 @@ void MessageReader::PropertiesReader::on
++index;
}
-/*
-MessageReader::DurableReader::DurableReader(MessageReader& p) : parent(p) {}
-void MessageReader::DurableReader::onBoolean(bool v, const Descriptor*)
-{
- parent.onDurable(v);
-}
-MessageReader::PriorityReader::PriorityReader(MessageReader& p) : parent(p) {}
-void MessageReader::PriorityReader::onUByte(uint8_t v, const Descriptor*)
-{
- parent.onPriority(v);
-}
-MessageReader::TtlReader::TtlReader(MessageReader& p) : parent(p) {}
-void MessageReader::TtlReader::onUInt(uint32_t v, const Descriptor*)
-{
- parent.onTtl(v);
-}
-MessageReader::FirstAcquirerReader::FirstAcquirerReader(MessageReader& p) :
parent(p) {}
-void MessageReader::FirstAcquirerReader::onBoolean(bool v, const Descriptor*)
-{
- parent.onFirstAcquirer(v);
-}
-MessageReader::DeliveryCountReader::DeliveryCountReader(MessageReader& p) :
parent(p) {}
-void MessageReader::DeliveryCountReader::onUInt(uint32_t v, const Descriptor*)
-{
- parent.onDeliveryCount(v);
-}
-MessageReader::MessageIdReader::MessageIdReader(MessageReader& p) : parent(p)
{}
-void MessageReader::MessageIdReader::onUuid(const qpid::types::Uuid& v, const
Descriptor*)
-{
- parent.onMessageId(v);
-}
-void MessageReader::MessageIdReader::onULong(uint64_t v, const Descriptor*)
-{
- parent.onMessageId(v);
-}
-void MessageReader::MessageIdReader::onString(const CharSequence& v, const
Descriptor*)
-{
- parent.onMessageId(v);
-}
-void MessageReader::MessageIdReader::onBinary(const CharSequence& v, const
Descriptor*)
-{
- parent.onMessageId(v);
-}
-MessageReader::UserIdReader::UserIdReader(MessageReader& p) : parent(p) {}
-void MessageReader::UserIdReader::onBinary(const CharSequence& v, const
Descriptor*)
-{
- parent.onUserId(v);
-}
-MessageReader::ToReader::ToReader(MessageReader& p) : parent(p) {}
-void MessageReader::ToReader::onString(const CharSequence& v, const
Descriptor*)
-{
- parent.onTo(v);
-}
-MessageReader::SubjectReader::SubjectReader(MessageReader& p) : parent(p) {}
-void MessageReader::SubjectReader::onString(const CharSequence& v, const
Descriptor*)
-{
- parent.onSubject(v);
-}
-MessageReader::ReplyToReader::ReplyToReader(MessageReader& p) : parent(p) {}
-void MessageReader::ReplyToReader::onString(const CharSequence& v, const
Descriptor*)
-{
- parent.onReplyTo(v);
-}
-MessageReader::CorrelationIdReader::CorrelationIdReader(MessageReader& p) :
parent(p) {}
-void MessageReader::CorrelationIdReader::onUuid(const qpid::types::Uuid& v,
const Descriptor*)
-{
- parent.onCorrelationId(v);
-}
-void MessageReader::CorrelationIdReader::onULong(uint64_t v, const Descriptor*)
-{
- parent.onCorrelationId(v);
-}
-void MessageReader::CorrelationIdReader::onString(const CharSequence& v, const
Descriptor*)
-{
- parent.onCorrelationId(v);
-}
-void MessageReader::CorrelationIdReader::onBinary(const CharSequence& v, const
Descriptor*)
-{
- parent.onCorrelationId(v);
-}
-MessageReader::ContentTypeReader::ContentTypeReader(MessageReader& p) :
parent(p) {}
-void MessageReader::ContentTypeReader::onString(const CharSequence& v, const
Descriptor*)
-{
- parent.onContentType(v);
-}
-MessageReader::ContentEncodingReader::ContentEncodingReader(MessageReader& p)
: parent(p) {}
-void MessageReader::ContentEncodingReader::onString(const CharSequence& v,
const Descriptor*)
-{
- parent.onContentEncoding(v);
-}
-MessageReader::AbsoluteExpiryTimeReader::AbsoluteExpiryTimeReader(MessageReader&
p) : parent(p) {}
-void MessageReader::AbsoluteExpiryTimeReader::onTimestamp(int64_t v, const
Descriptor*)
-{
- parent.onAbsoluteExpiryTime(v);
-}
-MessageReader::CreationTimeReader::CreationTimeReader(MessageReader& p) :
parent(p) {}
-void MessageReader::CreationTimeReader::onTimestamp(int64_t v, const
Descriptor*)
-{
- parent.onCreationTime(v);
-}
-MessageReader::GroupIdReader::GroupIdReader(MessageReader& p) : parent(p) {}
-void MessageReader::GroupIdReader::onString(const CharSequence& v, const
Descriptor*)
-{
- parent.onGroupId(v);
-}
-MessageReader::GroupSequenceReader::GroupSequenceReader(MessageReader& p) :
parent(p) {}
-void MessageReader::GroupSequenceReader::onUInt(uint32_t v, const Descriptor*)
-{
- parent.onGroupSequence(v);
-}
-MessageReader::ReplyToGroupIdReader::ReplyToGroupIdReader(MessageReader& p) :
parent(p) {}
-void MessageReader::ReplyToGroupIdReader::onString(const CharSequence& v,
const Descriptor*)
-{
- parent.onReplyToGroupId(v);
-}
-*/
-
//header, properties, amqp-sequence, amqp-value
bool MessageReader::onStartList(uint32_t count, const CharSequence& raw, const
Descriptor* descriptor)
{
Modified: qpid/trunk/qpid/cpp/src/tests/qpid-receive.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid-receive.cpp?rev=1502193&r1=1502192&r2=1502193&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid-receive.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid-receive.cpp Thu Jul 11 11:49:27 2013
@@ -222,6 +222,7 @@ int main(int argc, char ** argv)
if (opts.printHeaders) {
if (msg.getSubject().size()) std::cout <<
"Subject: " << msg.getSubject() << std::endl;
if (msg.getReplyTo()) std::cout << "ReplyTo: " <<
msg.getReplyTo() << std::endl;
+ if (msg.getMessageId().size()) std::cout <<
"MessageId: " << msg.getMessageId() << std::endl;
if (msg.getCorrelationId().size()) std::cout <<
"CorrelationId: " << msg.getCorrelationId() << std::endl;
if (msg.getUserId().size()) std::cout << "UserId:
" << msg.getUserId() << std::endl;
if (msg.getTtl().getMilliseconds()) std::cout <<
"TTL: " << msg.getTtl().getMilliseconds() << std::endl;
Modified: qpid/trunk/qpid/cpp/src/tests/qpid-send.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid-send.cpp?rev=1502193&r1=1502192&r2=1502193&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid-send.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid-send.cpp Thu Jul 11 11:49:27 2013
@@ -371,6 +371,7 @@ int main(int argc, char ** argv)
msg.setReplyTo(Address(opts.replyto));
}
if (!opts.userid.empty()) msg.setUserId(opts.userid);
+ if (!opts.id.empty()) msg.setMessageId(opts.id);
if (!opts.correlationid.empty())
msg.setCorrelationId(opts.correlationid);
opts.setProperties(msg);
uint sent = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
