BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to NormSession::DeleteTxObject() to close file for NORM_OBJECT_FILE _befere_ issuing PURGE notification

pull/72/head
bebopagogo 2022-09-07 11:48:40 -04:00
parent 2e3d00e254
commit b896f5408f
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/normObject.h
View File

@ -361,6 +361,7 @@ class NormFileObject : public NormObject
const char* infoPtr = NULL,
UINT16 infoLen = 0);
bool Accept(const char* thePath);
void CloseFile();
void Close();
const char* GetPath() {return path;}

7
src/common/normObject.cpp
View File

@ -2395,7 +2395,7 @@ bool NormFileObject::Accept(const char* thePath)
}
} // end NormFileObject::Accept()
void NormFileObject::Close()
void NormFileObject::CloseFile()
{
if (file.IsOpen())
{
@ -2403,6 +2403,11 @@ void NormFileObject::Close()
file.Unlock();
file.Close();
}
} // end NormFileObject::CloseFile()
void NormFileObject::Close()
{
CloseFile();
NormObject::Close();
} // end NormFileObject::Close()

2
src/common/normSession.cpp
View File

@ -2132,6 +2132,8 @@ void NormSession::DeleteTxObject(NormObject *obj, bool notify)
ASSERT(NULL != obj);
if (tx_table.Remove(obj))
{
if (NormObject::FILE == obj->GetType())
static_cast<NormFileObject*>(obj)->CloseFile();
Notify(NormController::TX_OBJECT_PURGED, (NormSenderNode *)NULL, obj);
NormObjectId objectId = obj->GetId();
tx_pending_mask.Unset(objectId);