retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Clear the "message" member of Channel only when script ended, else just mark it invalid. 

git-svn-id: http://voip.null.ro/svn/yate@5207 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2012-07-24 10:31:12 +00:00
parent f66cfe2ddc
commit 9789c3061c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/javascript.cpp
View File

@ -96,7 +96,7 @@ private:
bool runFunction(const String& name, Message& msg);
bool runScript(Message* msg, State newState);
bool setMsg(Message* msg);
void clearMsg();
void clearMsg(bool fromChannel);
ScriptRun* m_runner;
State m_state;
bool m_handled;
@ -1378,14 +1378,14 @@ bool JsAssist::setMsg(Message* msg)
return true;
}
void JsAssist::clearMsg()
void JsAssist::clearMsg(bool fromChannel)
{
Lock mylock((m_runner && m_runner->context()) ? m_runner->context()->mutex() : 0);
if (!m_message)
return;
m_message->clearMsg();
m_message = 0;
if (mylock.locked()) {
if (fromChannel && mylock.locked()) {
ObjList stack;
ScriptContext* chan = YOBJECT(ScriptContext,m_runner->context()->getField(stack,YSTRING("Channel"),m_runner));
if (chan) {
@ -1422,7 +1422,7 @@ bool JsAssist::runScript(Message* msg, State newState)
break;
}
bool handled = m_handled;
clearMsg();
clearMsg(m_state >= Ended);
#ifdef DEBUG
tm = Time::now() - tm;