hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1220: Fix error on PUT request with no parameters

Browse Source 
Whena server was modified and no parameters were given, the operation was
reported as a failure even though it was successful.
This commit is contained in:
Markus Mäkelä
2017-05-11 13:20:27 +03:00
committed by Markus Mäkelä
parent ca7b24f6fa
commit ffc6dba720
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/config_runtime.cc
View File

@ -955,6 +955,7 @@ bool runtime_alter_server_from_json(SERVER* server, json_t* new_json)
if (server_to_object_relations(server, old_json.get(), new_json)) if (server_to_object_relations(server, old_json.get(), new_json))
{ {
rval = true;
json_t* parameters = mxs_json_pointer(new_json, MXS_JSON_PTR_PARAMETERS); json_t* parameters = mxs_json_pointer(new_json, MXS_JSON_PTR_PARAMETERS);
json_t* old_parameters = mxs_json_pointer(old_json.get(), MXS_JSON_PTR_PARAMETERS); json_t* old_parameters = mxs_json_pointer(old_json.get(), MXS_JSON_PTR_PARAMETERS);
@ -962,7 +963,6 @@ bool runtime_alter_server_from_json(SERVER* server, json_t* new_json)
if (parameters) if (parameters)
{ {
rval = true;
const char* key; const char* key;
json_t* value; json_t* value;