Merge pull request #50 from TomVS/master

Fix queue declaration arguments
mbroadst · Sep 22, 2016 · 6d73c4c · 6d73c4c
2 parents d3180c6 2270f0b
commit 6d73c4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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();

diff --git 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)