You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2010/06/02 21:45:34 UTC
svn commit: r950735 - in /qpid/trunk/qpid/cpp/src/qpid/broker: Queue.cpp
SemanticState.cpp
Author: gsim
Date: Wed Jun 2 19:45:34 2010
New Revision: 950735
URL: http://svn.apache.org/viewvc?rev=950735&view=rev
Log:
QPID-2004: Now that connections are cleaned up on shutdown, some cluster safety assertions need to be relaxed.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=950735&r1=950734&r2=950735&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Wed Jun 2 19:45:34 2010
@@ -374,7 +374,6 @@ bool Queue::browseNextMessage(QueuedMess
void Queue::removeListener(Consumer::shared_ptr c)
{
- assertClusterSafe();
QueueListeners::NotificationSet set;
{
Mutex::ScopedLock locker(messageLock);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=950735&r1=950734&r2=950735&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Wed Jun 2 19:45:34 2010
@@ -391,7 +391,6 @@ SemanticState::ConsumerImpl::~ConsumerIm
void SemanticState::cancel(ConsumerImpl::shared_ptr c)
{
- assertClusterSafe();
c->disableNotify();
if (session.isAttached())
session.getConnection().outputTasks.removeOutputTask(c.get());
@@ -698,7 +697,6 @@ void SemanticState::ConsumerImpl::enable
void SemanticState::ConsumerImpl::disableNotify()
{
Mutex::ScopedLock l(lock);
- assertClusterSafe();
notifyEnabled = false;
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org