Skip to content

Commit ecd21bc

Browse files
committed
Fixed req_timer create & destroy
1 parent 04a8861 commit ecd21bc

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/jrd/exe.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -851,14 +851,14 @@ void EXE_release(thread_db* tdbb, Request* request)
851851
request->req_attachment = nullptr;
852852
}
853853

854-
if (request->isUsed())
855-
request->setUnused();
856-
857854
if (request->req_timer)
858855
{
859856
request->req_timer->stop();
860857
request->req_timer = nullptr;
861858
}
859+
860+
if (request->isUsed())
861+
request->setUnused();
862862
}
863863

864864

@@ -1454,7 +1454,7 @@ void EXE_execute_triggers(thread_db* tdbb,
14541454
if (trigger_action == TRIGGER_DISCONNECT)
14551455
{
14561456
if (!trigger->req_timer)
1457-
trigger->req_timer = FB_NEW_POOL(*tdbb->getAttachment()->att_pool) TimeoutTimer();
1457+
trigger->req_timer = FB_NEW_POOL(MetadataCache::get(tdbb)->getPool()) TimeoutTimer();
14581458

14591459
const unsigned int timeOut = tdbb->getDatabase()->dbb_config->getOnDisconnectTrigTimeout() * 1000;
14601460
trigger->req_timer->setup(timeOut, isc_cfg_stmt_timeout);

0 commit comments

Comments
 (0)