Changeset 2109 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect

Timestamp:

Apr 16, 2007 4:40:51 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

20427

Message:

XPCOM/IPC/DConnect: Fixed: The remote object stub always returned NS_OK after getting a failure from the peer followed by a serialized excetion.

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -1863 +1863 @@
 
       nsIException *xcpt = nsnull;
-      rv = dConnect->DeserializeException (completion.Params(),
-                                           completion.ParamsLen(),
-                                           mPeerID, &xcpt);
-      if (NS_SUCCEEDED(rv))
-      {
-        rv = em->SetCurrentException(xcpt);
+      nsresult rv2; // preserve rv for returning to the caller
+      rv2 = dConnect->DeserializeException (completion.Params(),
+                                            completion.ParamsLen(),
+                                            mPeerID, &xcpt);
+      if (NS_SUCCEEDED(rv2))
+      {
+        rv2 = em->SetCurrentException(xcpt);
         NS_IF_RELEASE(xcpt);
       }
-      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to deserialize/set exception");
+      NS_ASSERTION(NS_SUCCEEDED(rv2), "failed to deserialize/set exception");
     }
   }