From 28d1bbd6eaead440a947b876b74089f1fa5b298e Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 2 Jun 2010 19:45:34 +0000 Subject: QPID-2004: Now that connections are cleaned up on shutdown, some cluster safety assertions need to be relaxed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@950735 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Queue.cpp | 1 - cpp/src/qpid/broker/SemanticState.cpp | 2 -- 2 files changed, 3 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index 42c678cb68..8c9e5b8c48 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -374,7 +374,6 @@ bool Queue::browseNextMessage(QueuedMessage& m, Consumer::shared_ptr c) void Queue::removeListener(Consumer::shared_ptr c) { - assertClusterSafe(); QueueListeners::NotificationSet set; { Mutex::ScopedLock locker(messageLock); diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp index e85d835444..b8981b4877 100644 --- a/cpp/src/qpid/broker/SemanticState.cpp +++ b/cpp/src/qpid/broker/SemanticState.cpp @@ -391,7 +391,6 @@ SemanticState::ConsumerImpl::~ConsumerImpl() 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::enableNotify() void SemanticState::ConsumerImpl::disableNotify() { Mutex::ScopedLock l(lock); - assertClusterSafe(); notifyEnabled = false; } -- cgit v1.2.1