diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-04-21 22:07:04 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-04-21 22:07:04 +0000 |
| commit | 49058d80637096b65b198d4dce7fb98a1151d2b0 (patch) | |
| tree | 2d2c6d77130f2337015c66b62df2ec125d211320 /cpp/src/qpid/cluster/Cluster.cpp | |
| parent | 26d81efa13c8878f4584a721a3f0ea72ce27775f (diff) | |
| download | qpid-python-49058d80637096b65b198d4dce7fb98a1151d2b0.tar.gz | |
QPID-2527: Remove Thread::id member as its uses are better implemented by comparison
operators.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@936537 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Cluster.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index b1afeb6c7c..924297fcba 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -308,7 +308,7 @@ Cluster::Cluster(const ClusterSettings& set, broker::Broker& b) : Cluster::~Cluster() { broker.setClusterTimer(std::auto_ptr<sys::Timer>(0)); // Delete cluster timer - if (updateThread.id()) updateThread.join(); // Join the previous updatethread. + if (updateThread) updateThread.join(); // Join the previous updatethread. } void Cluster::initialize() { @@ -831,7 +831,7 @@ void Cluster::retractOffer(const MemberId& updater, uint64_t updateeInt, Lock& l if (updater == self) { assert(state == OFFER); if (url) { // My offer was first. - if (updateThread.id()) + if (updateThread) updateThread.join(); // Join the previous updateThread to avoid leaks. updateThread = Thread(new RetractClient(*url, connectionSettings(settings))); } @@ -848,7 +848,7 @@ void Cluster::updateStart(const MemberId& updatee, const Url& url, Lock& l) { assert(state == OFFER); state = UPDATER; QPID_LOG(notice, *this << " sending update to " << updatee << " at " << url); - if (updateThread.id()) + if (updateThread) updateThread.join(); // Join the previous updateThread to avoid leaks. updateThread = Thread( new UpdateClient(self, updatee, url, broker, map, *expiryPolicy, |