diff options
| author | Alan Conway <aconway@apache.org> | 2010-10-27 18:01:27 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-10-27 18:01:27 +0000 |
| commit | 326dddd0d0d48401d14ca93044b3fc0e35ad87d9 (patch) | |
| tree | 019a45480d8cdf832f62d7176b7a10a5d0971535 /cpp/src/qpid/broker/Broker.cpp | |
| parent | aae11121cfcf891b2365241141f9ab9cb47d3024 (diff) | |
| download | qpid-python-326dddd0d0d48401d14ca93044b3fc0e35ad87d9.tar.gz | |
Revert experimental cluster code, too close to 0.8 release.
Reverts revisions:
r1023966 "Introduce broker::Cluster interface."
r1024275 "Fix compile error: outline set/getCluster fucntions on Broker."
r1027210 "New cluster: core framework and initial implementation of enqueue logic."
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1028055 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Broker.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Broker.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index c93949e33f..33364e48df 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -24,7 +24,6 @@ #include "qpid/broker/FanOutExchange.h" #include "qpid/broker/HeadersExchange.h" #include "qpid/broker/MessageStoreModule.h" -#include "qpid/broker/NullCluster.h" #include "qpid/broker/NullMessageStore.h" #include "qpid/broker/RecoveryManagerImpl.h" #include "qpid/broker/SaslAuthenticator.h" @@ -147,7 +146,6 @@ Broker::Broker(const Broker::Options& conf) : conf.qmf2Support) : 0), store(new NullMessageStore), - cluster(new NullCluster), acl(0), dataDir(conf.noDataDir ? std::string() : conf.dataDir), queues(this), @@ -512,9 +510,5 @@ void Broker::setClusterTimer(std::auto_ptr<sys::Timer> t) { const std::string Broker::TCP_TRANSPORT("tcp"); -void Broker::setCluster(std::auto_ptr<Cluster> c) { cluster = c; } - -Cluster& Broker::getCluster() { return *cluster; } - }} // namespace qpid::broker |