From fd7537c3f3dbe1c0f67c49472995d31e181cb100 Mon Sep 17 00:00:00 2001 From: Thomas Vincent-Sweet Date: Wed, 22 Jun 2016 11:16:17 +0100 Subject: [PATCH 1/2] Fix queue declaration arguments --- src/qamqpqueue.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qamqpqueue.cpp b/src/qamqpqueue.cpp index 6a01585..ee4b9a1 100644 --- a/src/qamqpqueue.cpp +++ b/src/qamqpqueue.cpp @@ -263,8 +263,8 @@ void QAmqpQueuePrivate::declare() QAmqpMethodFrame frame(QAmqpFrame::Queue, QAmqpQueuePrivate::miDeclare); frame.setChannel(channelNumber); - QByteArray arguments; - QDataStream out(&arguments, QIODevice::WriteOnly); + QByteArray args; + QDataStream out(&args, QIODevice::WriteOnly); out << qint16(0); //reserved 1 QAmqpFrame::writeAmqpField(out, QAmqpMetaType::ShortString, name); @@ -276,7 +276,7 @@ void QAmqpQueuePrivate::declare() options & QAmqpQueue::Exclusive, options & QAmqpQueue::AutoDelete, options & QAmqpQueue::NoWait); - frame.setArguments(arguments); + frame.setArguments(args); sendFrame(frame); if (delayedDeclare) From 2270f0ba953e85883f9bc0745e2d1201bccffed1 Mon Sep 17 00:00:00 2001 From: Thomas Vincent-Sweet Date: Fri, 24 Jun 2016 12:57:26 +0100 Subject: [PATCH 2/2] No need to set message ID to 0 by default. Let exchange handle that if we don't specify. --- src/qamqpexchange.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qamqpexchange.cpp b/src/qamqpexchange.cpp index 2653d2e..e723c81 100644 --- a/src/qamqpexchange.cpp +++ b/src/qamqpexchange.cpp @@ -321,7 +321,6 @@ void QAmqpExchange::publish(const QByteArray &message, const QString &routingKey content.setProperty(QAmqpMessage::ContentType, mimeType); content.setProperty(QAmqpMessage::ContentEncoding, "utf-8"); content.setProperty(QAmqpMessage::Headers, headers); - content.setProperty(QAmqpMessage::MessageId, "0"); QAmqpMessage::PropertyHash::ConstIterator it; QAmqpMessage::PropertyHash::ConstIterator itEnd = properties.constEnd();