Skip to content

Add empty config value for scope based config setting #5551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvazquez merged 1 commit into from
Oct 5, 2021
Merged

Add empty config value for scope based config setting #5551

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down