From ffc6dba72088835bebc26e414d7f5e9ca3646a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 11 May 2017 13:20:27 +0300 Subject: [PATCH] MXS-1220: Fix error on PUT request with no parameters Whena server was modified and no parameters were given, the operation was reported as a failure even though it was successful. --- server/core/config_runtime.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc index 0a6e7e840..e51d8b45a 100644 --- a/server/core/config_runtime.cc +++ b/server/core/config_runtime.cc @@ -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)) { + rval = true; 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); @@ -962,7 +963,6 @@ bool runtime_alter_server_from_json(SERVER* server, json_t* new_json) if (parameters) { - rval = true; const char* key; json_t* value;