Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*not part of the build*

Browse Source 
fix for 15507 15510
(add on)


git-svn-id: svn://10.0.0.236/trunk@97046 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
idk%eng.sun.com
2001-06-13 09:05:48 +00:00
parent 6cf4be4e91
commit f556d1a6b5
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/java/xpcom/xpcom/bcXPCOMProxy.cpp
View File

@@ -153,9 +153,13 @@ NS_IMETHODIMP bcXPCOMProxy::CallMethod(PRUint16 methodIndex,
}
NS_IF_RELEASE(eventQ);
bcIUnMarshaler * unmarshaler = call->GetUnMarshaler();
mt->UnMarshal(unmarshaler);
nsresult result;
unmarshaler->ReadSimple(&result, bc_T_U32);
if (NS_SUCCEEDED(result)) {
mt->UnMarshal(unmarshaler);
}
delete call; delete marshaler; delete unmarshaler; delete mt;
return NS_OK;
return result;
}
nsrefcnt bcXPCOMProxy::AddRef(void) {

8
mozilla/java/xpcom/xpcom/bcXPCOMStub.cpp
View File

@@ -111,10 +111,12 @@ void bcXPCOMStub::DispatchAndSaveThread(bcICall *call, nsIEventQueue *eventQueue
stubsAndProxiesService->PushEventQueue(eventQueue);
//nb return value; excepion handling
PR_LOG(log, PR_LOG_DEBUG, ("--bcXPCOMStub::DispatchAndSaveThreade about to XPTC_InvokeByIndex\n"));
XPTC_InvokeByIndex(object, mid, paramCount, params);
nsresult result = XPTC_InvokeByIndex(object, mid, paramCount, params);
PR_LOG(log, PR_LOG_DEBUG, ("--bcXPCOMStub::DispatchAndSaveThreade after XPTC_InvokeByIndex\n"));
if (mt != NULL) { //nb to do what about nsresult ?
bcIMarshaler * m = call->GetMarshaler();
bcIMarshaler * m = call->GetMarshaler();
m->WriteSimple(&result, bc_T_U32);
if (NS_SUCCEEDED(result)
&& mt != NULL) {
PR_LOG(log, PR_LOG_DEBUG, ("--bcXPCOMStub::DispatchAndSaveThreade about to mt->Marshal\n"));
mt->Marshal(m);
delete m;