Author: kgiusti
Date: Wed Apr 4 19:51:22 2012
New Revision: 1309570
URL: http://svn.apache.org/viewvc?rev=1309570&view=rev
Log:
QPID-3767: fix connection id reference
Modified:
qpid/branches/qpid-3767/qpid/cpp/src/qpid/broker/Link.cpp
qpid/branches/qpid-3767/qpid/tools/src/py/qpid-tool
Modified: qpid/branches/qpid-3767/qpid/cpp/src/qpid/broker/Link.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/cpp/src/qpid/broker/Link.cpp?rev=1309570&r1=1309569&r2=1309570&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/cpp/src/qpid/broker/Link.cpp (original)
+++ qpid/branches/qpid-3767/qpid/cpp/src/qpid/broker/Link.cpp Wed Apr 4
19:51:22 2012
@@ -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();
Modified: qpid/branches/qpid-3767/qpid/tools/src/py/qpid-tool
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/tools/src/py/qpid-tool?rev=1309570&r1=1309569&r2=1309570&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/tools/src/py/qpid-tool (original)
+++ qpid/branches/qpid-3767/qpid/tools/src/py/qpid-tool Wed Apr 4 19:51:22 2012
@@ -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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
