equal
deleted
inserted
replaced
58 DeviceLiwPeer::~DeviceLiwPeer() |
58 DeviceLiwPeer::~DeviceLiwPeer() |
59 { |
59 { |
60 delete m_serviceName; |
60 delete m_serviceName; |
61 m_callbackArray->ResetAndDestroy(); |
61 m_callbackArray->ResetAndDestroy(); |
62 m_callbackArray->Close(); |
62 m_callbackArray->Close(); |
|
63 delete m_callbackArray; |
|
64 m_callbackArray = NULL; |
63 m_interface->Close(); |
65 m_interface->Close(); |
64 m_interface = NULL; // in majority cases, the interface close methods delete them selves. |
66 m_interface = NULL; // in majority cases, the interface close methods delete them selves. |
65 } |
67 } |
66 |
68 |
67 |
69 |
124 } |
126 } |
125 //Convert params to JS list and call m_onServiceEventCallback->InvokeCall() |
127 //Convert params to JS list and call m_onServiceEventCallback->InvokeCall() |
126 List params; |
128 List params; |
127 JSLock::lock(); |
129 JSLock::lock(); |
128 JSValue* vEventParams = m_binding->LiwGenericParamList2JsArray( |
130 JSValue* vEventParams = m_binding->LiwGenericParamList2JsArray( |
129 m_globalExecState, &eventParamList ); |
131 m_globalExecState, &eventParamList, ETrue ); |
130 JSLock::unlock(); |
132 JSLock::unlock(); |
131 params.append( jsNumber( cmdId ) ); |
133 params.append( jsNumber( cmdId ) ); |
132 params.append( jsNumber( eventId ) ); |
134 params.append( jsNumber( eventId ) ); |
133 params.append( vEventParams ); |
135 params.append( vEventParams ); |
134 |
136 |