From c42420da2d8faefb09a98247039efa55236bc301 Mon Sep 17 00:00:00 2001 From: Adriano dos Santos Fernandes Date: Sun, 26 Nov 2017 18:39:49 -0200 Subject: [PATCH] Misc. --- src/dsql/dsql.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/dsql/dsql.cpp b/src/dsql/dsql.cpp index 805fb6ab20..f8f14f817b 100644 --- a/src/dsql/dsql.cpp +++ b/src/dsql/dsql.cpp @@ -1520,11 +1520,8 @@ static dsql_req* prepareStatement(thread_db* tdbb, dsql_dbb* database, jrd_tra* } else { - if (scratchPool) - database->deletePool(scratchPool); - - if (statementPool) - database->deletePool(statementPool); + database->deletePool(scratchPool); + database->deletePool(statementPool); } throw; @@ -1791,9 +1788,7 @@ void dsql_req::destroy(thread_db* tdbb, dsql_req* request, bool drop) if (drop) { request->req_dbb->deletePool(&request->getPool()); - - if (request->liveScratchPool) - request->req_dbb->deletePool(request->liveScratchPool); + request->req_dbb->deletePool(request->liveScratchPool); } }