Changeset 78754 in vbox

Timestamp:

May 26, 2019 2:20:10 AM (6 years ago)

Author:

vboxsync

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

130841

Message:

Main/Appliance: Some cleanups of i_writeImpl and i_writeOPCImpl. Don't use BstrFmt when i_setupProgress takes a Utf8Str. Don't catch exceptions other than bad_alloc as there aren't supposed to be any other thrown. that's just misleading and confusing.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

@@ -792 +792 @@
 HRESULT Appliance::i_writeImpl(ovf::OVFVersion_T aFormat, const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
 {
-    HRESULT rc;
-
-    rc = i_setUpProgress(aProgress,
-                         BstrFmt(tr("Export appliance '%s'"), aLocInfo.strPath.c_str()),
-                         (aLocInfo.storageType == VFSType_File) ? WriteFile : WriteS3);
-    if (FAILED(rc))
-        return rc;
-
-    /* Initialize our worker task */
-    TaskOVF* task = NULL;
+    /* Prepare progress object: */
+    HRESULT hrc;
     try
     {
-        task = new TaskOVF(this, TaskOVF::Write, aLocInfo, aProgress);
-    }
-    catch(...)
-    {
-        return setError(VBOX_E_OBJECT_NOT_FOUND,
-                        tr("Could not create TaskOVF object for for writing out the OVF to disk"));
-    }
-
-    /* The OVF version to write */
-    task->enFormat = aFormat;
-
-    rc = task->createThread();
-
-    return rc;
+        hrc = i_setUpProgress(aProgress,
+                              Utf8StrFmt(tr("Export appliance '%s'"), aLocInfo.strPath.c_str()),
+                              aLocInfo.storageType == VFSType_File ? WriteFile : WriteS3);
+    }
+    catch (std::bad_alloc &) /* only Utf8StrFmt */
+    {
+        hrc = E_OUTOFMEMORY;
+    }
+    if (SUCCEEDED(hrc))
+    {
+        /* Create our worker task: */
+        TaskOVF *pTask = NULL;
+        try
+        {
+            pTask = new TaskOVF(this, TaskOVF::Write, aLocInfo, aProgress);
+        }
+        catch (std::bad_alloc &)
+        {
+            return E_OUTOFMEMORY;
+        }
+
+        /* The OVF version to produce: */
+        pTask->enFormat = aFormat;
+
+        /* Start the thread: */
+        hrc = pTask->createThread();
+        pTask = NULL;
+    }
+    return hrc;
 }
 
@@ -916 +923 @@
 HRESULT Appliance::i_writeOPCImpl(ovf::OVFVersion_T aFormat, const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
 {
-    HRESULT rc;
     RT_NOREF(aFormat);
 
-    rc = i_setUpProgress(aProgress,
-                         BstrFmt(tr("Export appliance '%s'"), aLocInfo.strPath.c_str()),
-                         (aLocInfo.storageType == VFSType_File) ? WriteFile : WriteS3);
-    if (FAILED(rc))
-        return rc;
-
-    /* Initialize our worker task */
-    TaskOPC* task = NULL;
+    /* Prepare progress object: */
+    HRESULT hrc;
     try
     {
-        task = new Appliance::TaskOPC(this, TaskOPC::Export, aLocInfo, aProgress);
-    }
-    catch(...)
-    {
-        return setError(VBOX_E_OBJECT_NOT_FOUND,
-                        tr("Could not create TaskOPC object for for writing out the OPC to disk"));
-    }
-
-    rc = task->createThread();
-
-    return rc;
+        hrc = i_setUpProgress(aProgress,
+                              Utf8StrFmt(tr("Export appliance '%s'"), aLocInfo.strPath.c_str()),
+                              aLocInfo.storageType == VFSType_File ? WriteFile : WriteS3);
+    }
+    catch (std::bad_alloc &) /* only Utf8StrFmt */
+    {
+        hrc = E_OUTOFMEMORY;
+    }
+    if (SUCCEEDED(hrc))
+    {
+        /* Create our worker task: */
+        TaskOPC *pTask = NULL;
+        try
+        {
+            pTask = new Appliance::TaskOPC(this, TaskOPC::Export, aLocInfo, aProgress);
+        }
+        catch (std::bad_alloc &)
+        {
+            return E_OUTOFMEMORY;
+        }
+
+        /* Kick it off: */
+        hrc = pTask->createThread();
+        pTask = NULL;
+    }
+    return hrc;
 }