summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2009-01-15 11:15:16 +0000
committerGordon Sim <gsim@apache.org>2009-01-15 11:15:16 +0000
commita48340c029e7d7c4e3085e2d15632d5fb45f9343 (patch)
treeeff838e15b357b4779037f3052426ccf6fdd4b69 /cpp
parentcdf022dc39cb6568b90c03537423ba4419884723 (diff)
downloadqpid-python-a48340c029e7d7c4e3085e2d15632d5fb45f9343.tar.gz
Minor formatting fixes and typo correction.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@734668 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/qpid/broker/QueueRegistry.cpp10
-rw-r--r--cpp/src/qpid/broker/QueueRegistry.h2
-rw-r--r--cpp/src/qpid/client/ConnectionImpl.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/cpp/src/qpid/broker/QueueRegistry.cpp
index 2447ce5402..2cb801bf83 100644
--- a/cpp/src/qpid/broker/QueueRegistry.cpp
+++ b/cpp/src/qpid/broker/QueueRegistry.cpp
@@ -97,11 +97,11 @@ void QueueRegistry::updateQueueClusterState(bool _lastNode)
RWlock::ScopedRlock locker(lock);
for (QueueMap::iterator i = queues.begin(); i != queues.end(); i++) {
if (_lastNode){
- i->second->setLastNodeFailure();
- } else {
- i->second->clearLastNodeFailure();
- }
+ i->second->setLastNodeFailure();
+ } else {
+ i->second->clearLastNodeFailure();
+ }
}
- lastNode = _lastNode;
+ lastNode = _lastNode;
}
diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/cpp/src/qpid/broker/QueueRegistry.h
index ca2cd132c4..c53ba668cc 100644
--- a/cpp/src/qpid/broker/QueueRegistry.h
+++ b/cpp/src/qpid/broker/QueueRegistry.h
@@ -121,7 +121,7 @@ private:
int counter;
MessageStore* store;
management::Manageable* parent;
- bool lastNode; //used to set mode on queue declare
+ bool lastNode; //used to set mode on queue declare
//destroy impl that assumes lock is already held:
void destroyLH (const string& name);
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index 46ef9eda1e..d0e47b774f 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -95,7 +95,7 @@ void ConnectionImpl::addSession(const boost::shared_ptr<SessionImpl>& session, u
session->setChannel(channel ? channel : nextChannel++);
boost::weak_ptr<SessionImpl>& s = sessions[session->getChannel()];
boost::shared_ptr<SessionImpl> ss = s.lock();
- if (ss) throw SessionBusyException(QPID_MSG("Channel " << ss->getChannel() << " attachd to " << ss->getId()));
+ if (ss) throw SessionBusyException(QPID_MSG("Channel " << ss->getChannel() << " attached to " << ss->getId()));
s = session;
}