event.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | event.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 82 | skipping to change at line 82 | |||
{ | { | |||
Database* const dbb = attachment->att_database; | Database* const dbb = attachment->att_database; | |||
EventManager* eventMgr = dbb->dbb_event_mgr; | EventManager* eventMgr = dbb->dbb_event_mgr; | |||
if (!eventMgr) | if (!eventMgr) | |||
{ | { | |||
const string id = dbb->getUniqueFileId(); | const string id = dbb->getUniqueFileId(); | |||
MutexLockGuard guard(g_mapMutex, FB_FUNCTION); | MutexLockGuard guard(g_mapMutex, FB_FUNCTION); | |||
if (!g_emMap->get(id, eventMgr)) | eventMgr = dbb->dbb_event_mgr; | |||
if (!eventMgr) | ||||
{ | { | |||
eventMgr = FB_NEW EventManager(id, dbb->dbb_config); | ||||
if (g_emMap->put(id, eventMgr)) | if (!g_emMap->get(id, eventMgr)) | |||
{ | { | |||
fb_assert(false); | eventMgr = FB_NEW EventManager(id, dbb->dbb_confi | |||
g); | ||||
if (g_emMap->put(id, eventMgr)) | ||||
{ | ||||
fb_assert(false); | ||||
} | ||||
} | } | |||
} | ||||
fb_assert(eventMgr); | fb_assert(eventMgr); | |||
eventMgr->addRef(); | eventMgr->addRef(); | |||
dbb->dbb_event_mgr = eventMgr; | dbb->dbb_event_mgr = eventMgr; | |||
} | ||||
} | } | |||
if (!attachment->att_event_session) | if (!attachment->att_event_session) | |||
attachment->att_event_session = eventMgr->create_session(); | attachment->att_event_session = eventMgr->create_session(); | |||
} | } | |||
void EventManager::destroy(EventManager* eventMgr) | void EventManager::destroy(EventManager* eventMgr) | |||
{ | { | |||
if (eventMgr) | if (eventMgr) | |||
{ | { | |||
End of changes. 7 change blocks. | ||||
8 lines changed or deleted | 14 lines changed or added |