diff options
| author | Alan Conway <aconway@apache.org> | 2007-07-24 19:39:27 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-07-24 19:39:27 +0000 |
| commit | b7c528b027bff7585481c9ce3a01144040c6de5a (patch) | |
| tree | 6e4588e6b52a5a5457767ae9f8b59cddcfd28ef6 /cpp/src/tests/Cluster.h | |
| parent | 0dcc71862cb48a79263a05facd4c42453441cbb5 (diff) | |
| download | qpid-python-b7c528b027bff7585481c9ce3a01144040c6de5a.tar.gz | |
* Summary:
- Wiring (declare/delete/bind) is replicated via AIS.
- TestOptions includes all logging options.
- Logger automatically parses env vars so logging can be enabled
for any program linked with libqpidcommon e.g. by setting QPID_TRACE=1.
* src/qpid/cluster/SessionManager.cpp: Handle frames from cluster
- Forward to BrokerAdapter for execution.
- Suppress responses in proxy.
* src/tests/TestOptions.h (Options): Logging options, --help option.
* src/qpid/client/ClientConnection.cpp: Removed log initialization.
Logs are initialized either in TestOptions or automatically from env vars,
e.g. QPID_TRACE,
* src/qpid/QpidError.h (class QpidError): Initialize Exception in
constructor so messages can be logged.
* src/qpid/framing/ChannelAdapter.h: Made send() virtual.
* src/tests/Cluster_child.cpp: UUID corrected.
* src/qpid/broker/Broker.cpp: Pass chains to updater by ref.
* src/qpid/Options.cpp (parse): Fix log settings from environment.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@559171 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/Cluster.h')
| -rw-r--r-- | cpp/src/tests/Cluster.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/tests/Cluster.h b/cpp/src/tests/Cluster.h index c2909e0c1b..e896fccafe 100644 --- a/cpp/src/tests/Cluster.h +++ b/cpp/src/tests/Cluster.h @@ -64,9 +64,9 @@ class TestHandler : public Handler<T&>, public vector<T> Mutex::ScopedLock l(lock); BOOST_MESSAGE(getpid()<<" TestHandler::waitFor("<<n<<") "<<this->size()); AbsTime deadline(now(), 2*TIME_SEC); - while (vector<T>::size() < n && lock.wait(deadline)) + while (this->size() < n && lock.wait(deadline)) ; - return vector<T>::size() >= n; + return this->size() >= n; } }; |
