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

Extend JS Message constructor to copy parameters from a given object. 

Fix function that was copying properties to message to not copy objects, null or undefined.



git-svn-id: http://yate.null.ro/svn/yate/trunk@6209 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
oana 2017-04-26 15:53:15 +00:00
parent 511a5d36ca
commit f180ed599d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/javascript.cpp
View File

@ -987,7 +987,7 @@ static void copyObjParams(NamedList& dest, const NamedList* src)
unsigned int n = src->length();
for (unsigned int i = 0; i < n; i++) {
const NamedString* p = src->getParam(i);
if (p && !p->name().startsWith("__"))
if (p && !p->name().startsWith("__") && !p->getObject(YATOM("ExpWrapper")))
dest.setParam(p->name(),*p);
}
}
@ -2281,17 +2281,24 @@ JsObject* JsMessage::runConstructor(ObjList& stack, const ExpOperation& oper, Ge
switch (extractArgs(stack,oper,context,args)) {
case 1:
case 2:
case 3:
break;
default:
return 0;
}
ExpOperation* name = static_cast<ExpOperation*>(args[0]);
ExpOperation* broad = static_cast<ExpOperation*>(args[1]);
JsObject* objParams = YOBJECT(JsObject,args[2]);
if (!name)
return 0;
if (!ref())
return 0;
Message* m = new Message(*name,0,broad && broad->valBoolean());
if (objParams) {
copyObjParams(*m,&objParams->params());
if (objParams->nativeParams())
copyObjParams(*m,objParams->nativeParams());
}
JsMessage* obj = new JsMessage(m,mutex(),true);
obj->params().addParam(new ExpWrapper(this,protoName()));
return obj;