From 9f2c0004c4e3117ac20bd3f37a3dbf9dc21b0a86 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 15 Apr 2021 12:12:32 +0200 Subject: [PATCH 1/3] update code which produce error which last fix (._.); --- login_server/src/cpp/SingletonManager/PendingTasksManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp index 1f8071908..3c1cdb965 100644 --- a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp +++ b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp @@ -192,7 +192,8 @@ void PendingTasksManager::checkForFinishedTasks(Poco::Timer& timer) auto json = transaction->getModel()->getResultJson(); bool removeIt = false; if (!json.isNull()) { - if (json->get("state").toString() == "success") { + auto state = json->get("state"); + if (!state.isEmpty() && json->get("state").toString() == "success") { removeIt = true; } } From 914613cf38acb2d550e189b6e2b04ae9379100e9 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 16 Apr 2021 13:40:03 +0200 Subject: [PATCH 2/3] update gradido protocol commit --- login_server/src/proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login_server/src/proto b/login_server/src/proto index ff412f735..924b51c87 160000 --- a/login_server/src/proto +++ b/login_server/src/proto @@ -1 +1 @@ -Subproject commit ff412f735667b30233c0ce00d461f209ac7dde7c +Subproject commit 924b51c87fea29d5aaf053af43251dab44c2eeb7 From e98b35102023d60d97bf9b8474d8010df0fe9395 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 16 Apr 2021 14:29:03 +0200 Subject: [PATCH 3/3] add Ufls suggested change --- login_server/src/cpp/SingletonManager/PendingTasksManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp index 3c1cdb965..619c6382b 100644 --- a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp +++ b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp @@ -193,7 +193,7 @@ void PendingTasksManager::checkForFinishedTasks(Poco::Timer& timer) bool removeIt = false; if (!json.isNull()) { auto state = json->get("state"); - if (!state.isEmpty() && json->get("state").toString() == "success") { + if (!state.isEmpty() && state.toString() == "success") { removeIt = true; } }