diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-04-04 19:51:22 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-04-04 19:51:22 +0000 |
| commit | 39406ef3d5c6b286fb14742f4635a1b8a86f9668 (patch) | |
| tree | aecd72f28d63045b2820c147367791997ff5e496 | |
| parent | 965b08e4d6c4eee7fe0d93126d373a19e22716e9 (diff) | |
| download | qpid-python-39406ef3d5c6b286fb14742f4635a1b8a86f9668.tar.gz | |
QPID-3767: fix connection id reference
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3767@1309570 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Link.cpp | 8 | ||||
| -rwxr-xr-x | qpid/tools/src/py/qpid-tool | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp index 911ec0ac0c..eda24dc302 100644 --- a/qpid/cpp/src/qpid/broker/Link.cpp +++ b/qpid/cpp/src/qpid/broker/Link.cpp @@ -177,9 +177,6 @@ void Link::established(Connection* c) currentInterval = 1; visitCount = 0; connection = c; - if (!hideManagement() && connection->GetManagementObject()) { - mgmtObject->set_connectionRef(connection->GetManagementObject()->getObjectId()); - } if (closing) destroy(); @@ -197,6 +194,11 @@ void Link::setUrl(const Url& u) { void Link::opened() { Mutex::ScopedLock mutex(lock); if (!connection) return; + + if (!hideManagement() && connection->GetManagementObject()) { + mgmtObject->set_connectionRef(connection->GetManagementObject()->getObjectId()); + } + // Get default URL from known-hosts if not already set if (url.empty()) { const std::vector<Url>& known = connection->getKnownHosts(); diff --git a/qpid/tools/src/py/qpid-tool b/qpid/tools/src/py/qpid-tool index af948b13a9..b31d93594c 100755 --- a/qpid/tools/src/py/qpid-tool +++ b/qpid/tools/src/py/qpid-tool @@ -455,6 +455,7 @@ class QmfData(Console): rows.append(row) else: print "No object found with ID %d" % dispId + return finally: self.lock.release() self.disp.table(caption, heads, rows) |