summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-04-15 20:18:45 +0000
committerAlan Conway <aconway@apache.org>2009-04-15 20:18:45 +0000
commitfbe009f663fd6da425e376fd89dbdb1dc7a33bee (patch)
tree61879d3dc94ee8037a375d59bf79341372775ce0 /cpp
parent10c71c4d7bef06f35de6b28c7c6d944351070432 (diff)
downloadqpid-python-fbe009f663fd6da425e376fd89dbdb1dc7a33bee.tar.gz
Fix bug in SocketProxy causing occasional hangs in tests.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@765338 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/tests/SocketProxy.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/tests/SocketProxy.h b/cpp/src/tests/SocketProxy.h
index 7697bf635f..ccce3c8842 100644
--- a/cpp/src/tests/SocketProxy.h
+++ b/cpp/src/tests/SocketProxy.h
@@ -101,11 +101,11 @@ class SocketProxy : private qpid::sys::Runnable
std::auto_ptr<LowSocket> server;
try {
fd_set socks;
- FD_ZERO(&socks);
FdType maxFd = listener.getFd();
- FD_SET(maxFd, &socks);
struct timeval tmo;
for (;;) {
+ FD_ZERO(&socks);
+ FD_SET(maxFd, &socks);
tmo.tv_sec = 0;
tmo.tv_usec = 500 * 1000;
if (select(maxFd+1, &socks, 0, 0, &tmo) == 0) {