From e40c45fb4635321f17f3d6e4f9a4566fb62b3623 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 22 Jun 2010 14:54:38 +0200 Subject: [PATCH] Revert "Bug 17754 - Fixed race condition in protected_change_timeout." This reverts commit b82ff17d7dd9689ab664e4a6c2a86c6f3dbfba69 and 9280395330c833dd98d0811d31349c26a84b2f6a. Conflicts: dbus/dbus-connection.c --- dbus/dbus-connection.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 16ba2c771..7f828c5fc 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -785,7 +785,6 @@ protected_change_timeout (DBusConnection *connection, * drop lock and call out" one; but it has to be propagated up through all callers */ -retry: timeouts = connection->timeouts; if (timeouts) { @@ -813,12 +812,7 @@ retry: return retval; } else - { - CONNECTION_UNLOCK (connection); - _dbus_sleep_milliseconds (1); - CONNECTION_LOCK (connection); - goto retry; - } + return FALSE; } /** -- 2.47.3