Merge pull request #39 from AdamMajer/master

This fixes segfaults trying to use the QAMQP::Client constructor with passed QUrl
This commit is contained in:
Alexey Shcherbakov 2014-05-02 10:57:07 +06:00
commit 34f418262a
1 changed files with 2 additions and 2 deletions

View File

@ -69,8 +69,8 @@ void ClientPrivate::init(QObject * parent)
void ClientPrivate::init(QObject * parent, const QUrl & con) void ClientPrivate::init(QObject * parent, const QUrl & con)
{ {
parseCnnString(con);
init(parent); init(parent);
parseCnnString(con);
ClientPrivate::connect(); ClientPrivate::connect();
} }
@ -111,7 +111,7 @@ void ClientPrivate::parseCnnString( const QUrl & con )
q->setSsl(con.scheme() == AMQPSSCHEME); q->setSsl(con.scheme() == AMQPSSCHEME);
q->setPassword(con.password()); q->setPassword(con.password());
q->setUser(con.userName()); q->setUser(con.userName());
q->setPort(con.port()); q->setPort(con.port(AMQPPORT));
q->setHost(con.host()); q->setHost(con.host());
q->setVirtualHost(con.path()); q->setVirtualHost(con.path());
} }