diff options
| author | Gordon Sim <gsim@apache.org> | 2010-06-02 19:45:34 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2010-06-02 19:45:34 +0000 |
| commit | 7776e2efa144a6179311a8e95e27c298a233d494 (patch) | |
| tree | 6333a703057f1a53de05e59a17830101d6160bb5 /qpid/cpp | |
| parent | 674d53b02b232554243b306524728560795bfa83 (diff) | |
| download | qpid-python-7776e2efa144a6179311a8e95e27c298a233d494.tar.gz | |
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@950735 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Queue.cpp | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/SemanticState.cpp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp index 42c678cb68..8c9e5b8c48 100644 --- a/qpid/cpp/src/qpid/broker/Queue.cpp +++ b/qpid/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/qpid/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp index e85d835444..b8981b4877 100644 --- a/qpid/cpp/src/qpid/broker/SemanticState.cpp +++ b/qpid/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; } |