X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cache.c;h=69ea864b99dbf1ddb2f35f8e82ae4078b0c8e9e6;hb=4dcc843a2370a6c6268249aae7185c78925c71f7;hp=9e7bc067dc8198605de7a4fd8fdac5798b9dbe41;hpb=9bf72b2afd1e7151cf02def4a5512ebc8626a0cf;p=collectd.git

diff --git a/src/utils_cache.c b/src/utils_cache.c
index 9e7bc067..69ea864b 100644
--- a/src/utils_cache.c
+++ b/src/utils_cache.c
@@ -319,7 +319,7 @@ int uc_check_timeout (void)
   while (c_avl_iterator_next (iter, (void *) &key, (void *) &ce) == 0)
   {
     /* If entry has not been updated, add to `keys' array */
-    if ((now - ce->last_update) >= (2 * ce->interval))
+    if ((now - ce->last_update) >= (timeout_g * ce->interval))
     {
       char **tmp;
 
@@ -1003,6 +1003,9 @@ static meta_data_t *uc_get_meta (const value_list_t *vl) /* {{{ */
   if (ce->meta == NULL)
     ce->meta = meta_data_create ();
 
+  if (ce->meta == NULL)
+    pthread_mutex_unlock (&cache_lock);
+
   return (ce->meta);
 } /* }}} meta_data_t *uc_get_meta */