firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 21:23:04 +01:00
Code Issues

This should fix bug CORE-6346 : New connection to the server hangs

Browse Source
This commit is contained in:
hvlad 2020-07-02 15:11:44 +03:00
parent fc6b04f4c6
commit e23273d615
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jrd/jrd.cpp
View File

@ -2564,19 +2564,8 @@ ITransaction* JTransaction::join(CheckStatusWrapper* user_status, ITransaction*
JTransaction* JTransaction::validate(CheckStatusWrapper* user_status, IAttachment* testAtt)
{
try
{
EngineContextHolder tdbb(user_status, this, FB_FUNCTION);
check_database(tdbb);
// Do not raise error in status - just return NULL if attachment does not match
return sAtt->getInterface() == testAtt ? this : NULL;
}
catch (const Exception& ex)
{
ex.stuffException(user_status);
}
return NULL;
// Do not raise error in status - just return NULL if attachment does not match
return (sAtt && sAtt->getInterface() == testAtt) ? this : NULL;
}
JTransaction* JTransaction::enterDtc(CheckStatusWrapper* user_status)