X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/4878eece18057b563452421a54979f7f11bad8fb..3634a92de5281a6b19ca03b49b21dad853f386b3:/messages.cpp?ds=sidebyside

diff --git a/messages.cpp b/messages.cpp
index 547a29f..6c9f3ec 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -70,19 +70,12 @@ bool message_queue::pop(message*& msg, msg_host_t& from, double timeout)
 
         mutex.acquire();
         if (!queue.try_pop(task)) {
-            xbt_ex_t e;
             XBT_DEBUG("waiting for a message to come");
-            TRY {
-                if (timeout > 0)
-                    cond.timedwait(mutex, timeout);
-                else
-                    cond.wait(mutex);
-            }
-            CATCH (e) {
-                if (e.category != timeout_error)
-                    RETHROW;
-                xbt_ex_free(e);
-                return false;   // got a timeout
+            if (timeout > 0) {
+                if (!cond.timedwait(mutex, timeout))
+                    return false;
+            } else {
+                cond.wait(mutex);
             }
             bool pop_was_successful = queue.try_pop(task);
             xbt_assert(pop_was_successful);