From 00b82616450beb69be6cb135422d9fbd46a1a5c4 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Tue, 5 Oct 2021 15:02:46 +0530 Subject: [PATCH] Add empty config value for scope based config setting --- .../configuration/ConfigurationManagerImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index 08ba1a31b40c..bea9cd0198dc 100755 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -826,12 +826,6 @@ public Configuration updateConfiguration(final UpdateCfgCmd cmd) throws InvalidP return _configDao.findByName(name); } - value = value.trim(); - - if (value.isEmpty() || value.equals("null")) { - value = null; - } - String scope = null; Long id = null; int paramCountCheck = 0; @@ -871,6 +865,12 @@ public Configuration updateConfiguration(final UpdateCfgCmd cmd) throws InvalidP throw new InvalidParameterValueException("cannot handle multiple IDs, provide only one ID corresponding to the scope"); } + value = value.trim(); + + if (value.isEmpty() || value.equals("null")) { + value = (id == null) ? null : ""; + } + final String updatedValue = updateConfiguration(userId, name, catergory, value, scope, id); if (value == null && updatedValue == null || updatedValue.equalsIgnoreCase(value)) { return _configDao.findByName(name);