diff options
| author | Scott James Remnant <scott@ubuntu.com> | 2009-05-11 22:42:32 +0100 |
|---|---|---|
| committer | Scott James Remnant <scott@ubuntu.com> | 2009-05-28 11:47:35 +0200 |
| commit | d33cfec625bf769384cc370ad0ea660c9993aa15 (patch) | |
| tree | 161c39fad845cc815ef3f1bbc84a529687c1aaf0 /bus | |
| parent | 7398ad7374c0a9201d41397c956deee325f3593e (diff) | |
Explicitly check for zero time fields.
* bus/expirelist.c (do_expiration_with_current_time): If the item added
time fields are both zero, always expire.
Signed-off-by: Scott James Remnant <scott@ubuntu.com>
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/expirelist.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bus/expirelist.c b/bus/expirelist.c index d718d9ff..038cfee3 100644 --- a/bus/expirelist.c +++ b/bus/expirelist.c @@ -157,7 +157,8 @@ do_expiration_with_current_time (BusExpireList *list, item->added_tv_usec, tv_sec, tv_usec); - if (elapsed >= (double) list->expire_after) + if (((item->added_tv_sec == 0) && (item->added_tv_usec == 0)) || + (elapsed >= (double) list->expire_after)) { _dbus_verbose ("Expiring an item %p\n", item); |