Author: aconway
Date: Fri Feb 17 14:17:22 2012
New Revision: 1245556
URL: http://svn.apache.org/viewvc?rev=1245556&view=rev
Log:
QPID-3603: Removed incorrect asserts from Link.cpp
Modified:
qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/broker/Link.cpp
Modified: qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/broker/Link.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/broker/Link.cpp?rev=1245556&r1=1245555&r2=1245556&view=diff
==============================================================================
--- qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/broker/Link.cpp (original)
+++ qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/broker/Link.cpp Fri Feb 17
14:17:22 2012
@@ -106,8 +106,9 @@ Link::Link(LinkRegistry* _links,
Link::~Link ()
{
- assert(state == STATE_CLOSED); // Can only get here after destroy()
- assert(connection == 0);
+ if (state == STATE_OPERATIONAL && connection != 0)
+ connection->close(CLOSE_CODE_CONNECTION_FORCED, "closed by
management");
+
if (mgmtObject != 0)
mgmtObject->resourceDestroy ();
}
@@ -162,7 +163,6 @@ void Link::established(Connection* c)
agent->raiseEvent(_qmf::EventBrokerLinkUp(addr.str()));
Mutex::ScopedLock mutex(lock);
- assert(state == STATE_CONNECTING);
setStateLH(STATE_OPERATIONAL);
currentInterval = 1;
visitCount = 0;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
