From 0d4b1cb1c634f6c97866668f3260968ca0b0f410 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 21 Jun 2021 13:16:30 +0200 Subject: [PATCH 1/2] remove transaction after sending not only form Pending Task Manager, but also from pending_tasks table --- login_server/src/cpp/model/gradido/Transaction.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/login_server/src/cpp/model/gradido/Transaction.cpp b/login_server/src/cpp/model/gradido/Transaction.cpp index e3c4ada0f..00bfc92ac 100644 --- a/login_server/src/cpp/model/gradido/Transaction.cpp +++ b/login_server/src/cpp/model/gradido/Transaction.cpp @@ -361,6 +361,7 @@ namespace model { auto pt = PendingTasksManager::getInstance(); pt->removeTask(Poco::AutoPtr(this, true)); + deleteFromDB(); return 1 == runSendTransaction(); //return true; } From 66acf96a7eaeb482483250a8a62207ef9fe26f63 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 21 Jun 2021 13:24:11 +0200 Subject: [PATCH 2/2] remove transaction also from pending task manager if aborted through old interface --- login_server/src/cpsp/CheckTransaction.cpsp | 1 + 1 file changed, 1 insertion(+) diff --git a/login_server/src/cpsp/CheckTransaction.cpsp b/login_server/src/cpsp/CheckTransaction.cpsp index 46cd5f2a3..e95629f3d 100644 --- a/login_server/src/cpsp/CheckTransaction.cpsp +++ b/login_server/src/cpsp/CheckTransaction.cpsp @@ -80,6 +80,7 @@ enum PageState { // if(transaction && transaction->getModel()->getUserId() == user_model->getID()) { + pt->removeTask(pending_task); transaction->deleteFromDB(); transaction = nullptr; }