diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-15 22:51:16 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-15 23:11:47 +0200 |
| commit | 0e5af7fa46c2363315eda0963c1826b8ca9d6a53 (patch) | |
| tree | 44c7d73e29c8b689b96775fd9f0366c9cf2b0131 | |
| parent | e908c9c29307d73855dfb21b7aadc5736b27d013 (diff) | |
| download | NetworkManager-0e5af7fa46c2363315eda0963c1826b8ca9d6a53.tar.gz | |
Revert "libnm: don't add objects to cache until they're async-inited"
Reverting, because patch breaks tests for "libnm/tests".
This reverts commit 88f0d646d5089dfc8df9b03750ade72e921803eb.
| -rw-r--r-- | libnm/nm-object.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libnm/nm-object.c b/libnm/nm-object.c index 36a5d173a4..2aaa4d9d96 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -468,11 +468,6 @@ create_async_inited (GObject *object, GAsyncResult *result, gpointer user_data) } create_async_complete (object, async_data); - - if (_nm_object_cache_get (async_data->path)) - g_clear_object (&object); - else - _nm_object_cache_add (NM_OBJECT (object)); } static void @@ -501,6 +496,7 @@ create_async_got_type (NMObjectTypeAsyncData *async_data, GType type) NM_OBJECT_PATH, async_data->path, NM_OBJECT_DBUS_CONNECTION, async_data->connection, NULL); + _nm_object_cache_add (NM_OBJECT (object)); g_async_initable_init_async (G_ASYNC_INITABLE (object), G_PRIORITY_DEFAULT, NULL, create_async_inited, async_data); } |