From 547ef24f597c5e06e5fded16622f59a922c3966b Mon Sep 17 00:00:00 2001 From: juanmont Date: Fri, 20 Jul 2018 11:23:30 +0200 Subject: [PATCH] B #2284: Added test to check quota assignment --- src/um/Quota.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/um/Quota.cc b/src/um/Quota.cc index 5deb23a55f..d189f7d375 100644 --- a/src/um/Quota.cc +++ b/src/um/Quota.cc @@ -372,10 +372,13 @@ int Quota::update_limits( { limit = va->vector_value_str(metrics[i], limit_f); - if (( limit_f == -1 && limit == "" ) // NaN - || + if (limit == "") + { + limit_f = DEFAULT; + } + // Negative. Default & unlimited allowed - ( !is_default && limit_f < 0 && limit_f != UNLIMITED && limit_f != DEFAULT ) + if (( !is_default && limit_f < 0 && limit_f != UNLIMITED && limit_f != DEFAULT ) || // Negative. Unlimited allowed ( is_default && limit_f < 0 && limit_f != UNLIMITED ) @@ -408,10 +411,13 @@ VectorAttribute * Quota::new_quota(VectorAttribute * va) limit = va->vector_value_str(metrics[i], limit_f); - if (( limit_f == -1 && limit == "" ) // NaN - || + if (limit == "") + { + limit_f = DEFAULT; + limit = DEFAULT_STR; + } // Negative. Default & unlimited allowed - ( !is_default && limit_f < 0 && limit_f != UNLIMITED && limit_f != DEFAULT ) + if (( !is_default && limit_f < 0 && limit_f != UNLIMITED && limit_f != DEFAULT ) || // Negative. Unlimited allowed ( is_default && limit_f < 0 && limit_f != UNLIMITED )