Author: aconway Date: Wed Apr 15 20:18:45 2009 New Revision: 765338 URL: http://svn.apache.org/viewvc?rev=765338&view=rev Log: Fix bug in SocketProxy causing occasional hangs in tests.
Modified: qpid/trunk/qpid/cpp/src/tests/SocketProxy.h Modified: qpid/trunk/qpid/cpp/src/tests/SocketProxy.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/SocketProxy.h?rev=765338&r1=765337&r2=765338&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/tests/SocketProxy.h (original) +++ qpid/trunk/qpid/cpp/src/tests/SocketProxy.h Wed Apr 15 20:18:45 2009 @@ -101,11 +101,11 @@ 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) { --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org