jessequ
/
qamqp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(QAmqpChannel): needOpen was false if channel was defined 

fixes #42
This commit is contained in:
Matt Broadstone 2016-03-28 11:29:38 -04:00
parent 79f5c4187c
commit 7d9f80331e
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qamqpchannel.cpp
View File

@ -31,7 +31,7 @@ QAmqpChannelPrivate::~QAmqpChannelPrivate()
void QAmqpChannelPrivate::init(int channel, QAmqpClient *c) void QAmqpChannelPrivate::init(int channel, QAmqpClient *c)
{ {
client = c; client = c;
needOpen = channel == -1 ? true : false; needOpen = (channel <= nextChannelNumber && channel != -1) ? false : true;
channelNumber = channel == -1 ? ++nextChannelNumber : channel; channelNumber = channel == -1 ? ++nextChannelNumber : channel;
nextChannelNumber = qMax(channelNumber, nextChannelNumber); nextChannelNumber = qMax(channelNumber, nextChannelNumber);
} }
@ -105,7 +105,7 @@ void QAmqpChannelPrivate::open()
if (!client->isConnected()) if (!client->isConnected())
return; return;
qAmqpDebug("<- channel#open( channel=%d )", channelNumber); qAmqpDebug("<- channel#open( channel=%d, name=%s )", channelNumber, qPrintable(name));
QAmqpMethodFrame frame(QAmqpFrame::Channel, miOpen); QAmqpMethodFrame frame(QAmqpFrame::Channel, miOpen);
frame.setChannel(channelNumber); frame.setChannel(channelNumber);
@ -135,18 +135,18 @@ void QAmqpChannelPrivate::flow(bool active)
void QAmqpChannelPrivate::flow(const QAmqpMethodFrame &frame) void QAmqpChannelPrivate::flow(const QAmqpMethodFrame &frame)
{ {
Q_UNUSED(frame); Q_UNUSED(frame);
qAmqpDebug("-> channel#flow( channel=%d )", channelNumber); qAmqpDebug("-> channel#flow( channel=%d, name=%s )", channelNumber, qPrintable(name));
} }
void QAmqpChannelPrivate::flowOk() void QAmqpChannelPrivate::flowOk()
{ {
qAmqpDebug("<- channel#flowOk( channel=%d )", channelNumber); qAmqpDebug("<- channel#flowOk( channel=%d, name=%s )", channelNumber, qPrintable(name));
} }
void QAmqpChannelPrivate::flowOk(const QAmqpMethodFrame &frame) void QAmqpChannelPrivate::flowOk(const QAmqpMethodFrame &frame)
{ {
Q_Q(QAmqpChannel); Q_Q(QAmqpChannel);
qAmqpDebug("-> channel#flowOk( channel=%d )", channelNumber); qAmqpDebug("-> channel#flowOk( channel=%d, name=%s )", channelNumber, qPrintable(name));
QByteArray data = frame.arguments(); QByteArray data = frame.arguments();
QDataStream stream(&data, QIODevice::ReadOnly); QDataStream stream(&data, QIODevice::ReadOnly);
@ -159,8 +159,8 @@ void QAmqpChannelPrivate::flowOk(const QAmqpMethodFrame &frame)
void QAmqpChannelPrivate::close(int code, const QString &text, int classId, int methodId) void QAmqpChannelPrivate::close(int code, const QString &text, int classId, int methodId)
{ {
qAmqpDebug("<- channel#close( channel=%d, reply-code=%d, text=%s class-id=%d, method-id:%d, )", qAmqpDebug("<- channel#close( channel=%d, name=%s, reply-code=%d, text=%s class-id=%d, method-id:%d, )",
channelNumber, code, qPrintable(text), classId, methodId); channelNumber, qPrintable(name), code, qPrintable(text), classId, methodId);
QByteArray arguments; QByteArray arguments;
QDataStream stream(&arguments, QIODevice::WriteOnly); QDataStream stream(&arguments, QIODevice::WriteOnly);
@ -202,8 +202,8 @@ void QAmqpChannelPrivate::close(const QAmqpMethodFrame &frame)
Q_EMIT q->error(error); Q_EMIT q->error(error);
} }
qAmqpDebug("-> channel#close( channel=%d, reply-code=%d, reply-text=%s, class-id=%d, method-id=%d, )", qAmqpDebug("-> channel#close( channel=%d, name=%s, reply-code=%d, reply-text=%s, class-id=%d, method-id=%d, )",
channelNumber, code, qPrintable(text), classId, methodId); channelNumber, qPrintable(name), code, qPrintable(text), classId, methodId);
// complete handshake // complete handshake
QAmqpMethodFrame closeOkFrame(QAmqpFrame::Channel, miCloseOk); QAmqpMethodFrame closeOkFrame(QAmqpFrame::Channel, miCloseOk);
@ -216,7 +216,7 @@ void QAmqpChannelPrivate::close(const QAmqpMethodFrame &frame)
void QAmqpChannelPrivate::closeOk(const QAmqpMethodFrame &) void QAmqpChannelPrivate::closeOk(const QAmqpMethodFrame &)
{ {
qAmqpDebug("-> channel#closeOk( channel=%d )", channelNumber); qAmqpDebug("-> channel#closeOk( channel=%d, name=%s )", channelNumber, qPrintable(name));
notifyClosed(); notifyClosed();
} }
@ -231,7 +231,7 @@ void QAmqpChannelPrivate::notifyClosed()
void QAmqpChannelPrivate::openOk(const QAmqpMethodFrame &) void QAmqpChannelPrivate::openOk(const QAmqpMethodFrame &)
{ {
Q_Q(QAmqpChannel); Q_Q(QAmqpChannel);
qAmqpDebug("-> channel#openOk( channel=%d )", channelNumber); qAmqpDebug("-> channel#openOk( channel=%d, name=%s )", channelNumber, qPrintable(name));
opened = true; opened = true;
Q_EMIT q->opened(); Q_EMIT q->opened();
q->channelOpened(); q->channelOpened();
@ -247,7 +247,7 @@ void QAmqpChannelPrivate::qosOk(const QAmqpMethodFrame &frame)
{ {
Q_Q(QAmqpChannel); Q_Q(QAmqpChannel);
Q_UNUSED(frame) Q_UNUSED(frame)
qAmqpDebug("-> basic#qosOk( channel=%d )", channelNumber); qAmqpDebug("-> basic#qosOk( channel=%d, name=%s )", channelNumber, qPrintable(name));
prefetchCount = requestedPrefetchCount; prefetchCount = requestedPrefetchCount;
prefetchSize = requestedPrefetchSize; prefetchSize = requestedPrefetchSize;
@ -322,8 +322,8 @@ void QAmqpChannel::qos(qint16 prefetchCount, qint32 prefetchSize)
stream << qint16(prefetchCount); stream << qint16(prefetchCount);
stream << qint8(0x0); // global stream << qint8(0x0); // global
qAmqpDebug("<- basic#qos( channel=%d, prefetch-size=%d, prefetch-count=%d, global=%d )", qAmqpDebug("<- basic#qos( channel=%d, name=%s, prefetch-size=%d, prefetch-count=%d, global=%d )",
d->channelNumber, prefetchSize, prefetchCount, 0); d->channelNumber, qPrintable(d->name), prefetchSize, prefetchCount, 0);
frame.setArguments(arguments); frame.setArguments(arguments);
d->sendFrame(frame); d->sendFrame(frame);

9
tests/auto/qamqpchannel/tst_qamqpchannel.cpp
View File

@ -17,6 +17,7 @@ private Q_SLOTS:
void close(); void close();
void resume(); void resume();
void sharedChannel(); void sharedChannel();
void defineWithChannelNumber();
private: private:
QScopedPointer<QAmqpClient> client; QScopedPointer<QAmqpClient> client;
@ -84,5 +85,13 @@ void tst_QAMQPChannel::sharedChannel()
QCOMPARE(message.payload(), QByteArray("first message")); QCOMPARE(message.payload(), QByteArray("first message"));
} }
void tst_QAMQPChannel::defineWithChannelNumber()
{
QString routingKey = "test-specific-channel-number";
QAmqpQueue *queue = client->createQueue(routingKey, 25);
declareQueueAndVerifyConsuming(queue);
QCOMPARE(queue->channelNumber(), 25);
}
QTEST_MAIN(tst_QAMQPChannel) QTEST_MAIN(tst_QAMQPChannel)
#include "tst_qamqpchannel.moc" #include "tst_qamqpchannel.moc"