From 9bdb69314746dcf56f7944c1fd9df8ffbc989da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 27 Nov 2012 12:42:46 +0100 Subject: [PATCH] Feature #1611: Fix quota cleanup --- src/um/Quota.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/um/Quota.cc b/src/um/Quota.cc index 179768640d..40c4d6b59e 100644 --- a/src/um/Quota.cc +++ b/src/um/Quota.cc @@ -323,8 +323,8 @@ void Quota::cleanup_quota(const string& qid) VectorAttribute * q; map::iterator q_it; - float limit, limit_tmp; - float usage, usage_tmp; + float usage, usage_tmp, limit_tmp; + bool no_limit; if ( get_quota(qid, &q, q_it) == -1) { @@ -336,8 +336,8 @@ void Quota::cleanup_quota(const string& qid) return; } - limit = 0; - usage = 0; + no_limit = true; + usage = 0; for (int i=0; i < num_metrics; i++) { @@ -348,11 +348,11 @@ void Quota::cleanup_quota(const string& qid) q->vector_value(metrics[i], limit_tmp); q->vector_value(metrics_used.c_str(), usage_tmp); - limit += limit_tmp; + no_limit = (no_limit && (limit_tmp <= 0) ); // Unlimited or default limit usage += usage_tmp; } - if ( limit == 0 && usage == 0 ) + if ( usage == 0 && no_limit ) { delete static_cast(q_it->second);