Changeset 30168 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 11, 2010 5:47:46 PM (15 years ago)

Author:

vboxsync

Message:

forward-port r62601: webservice: don't throw SOAP exceptions and return 0 if an API return code is available

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (1 diff)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -915 +915 @@
     // allocated our own soap fault struct
     _vbox__RuntimeFault *ex = soap_new__vbox__RuntimeFault(soap, 1);
-    ex->resultCode = info.getResultCode();
+    // some old vbox methods return errors without setting an error in the error info,
+    // so use the error info code if it's set and the HRESULT from the method otherwise
+    if (S_OK == (ex->resultCode = info.getResultCode()))
+        ex->resultCode = apirc;
     ex->text = ConvertComString(info.getText());
     ex->component = ConvertComString(info.getComponent());