Changeset 78963 in vbox for trunk

Timestamp:

Jun 4, 2019 11:01:43 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9416. Several changes in the exceptions handling.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (4 diffs)

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

@@ -1813 +1813 @@
 
                             size_t cbWritten;
-                            RTVfsFileWrite(hVfsDstFile, pvBuffered, cbBuffered, &cbWritten);
+                            vrc = RTVfsFileWrite(hVfsDstFile, pvBuffered, cbBuffered, &cbWritten);
                             if (RT_FAILURE(vrc))
                                 throw  setErrorVrc(vrc, tr("Could not write into the file '%s' (%Rrc)"), strAbsDstPath.c_str(), vrc);
@@ -1820 +1820 @@
                         {
                             hrc = aRc;
+                            strLastActualErrorDesc = Utf8StrFmt("%s: Processing the downloaded object was failed. "
+                                    "The exception (%Rrc)\n", __FUNCTION__, hrc);
+                            LogRel((strLastActualErrorDesc.c_str()));
+                        }
+                        catch (int aRc)
+                        {
+                            hrc = setErrorVrc(aRc);
+                            strLastActualErrorDesc = Utf8StrFmt("%s: Processing the downloaded object was failed. "
+                                    "The exception (%Rrc)\n", __FUNCTION__, aRc);
+                            LogRel((strLastActualErrorDesc.c_str()));
                         }
                         catch (...)
                         {
                             hrc = VERR_UNEXPECTED_EXCEPTION;
+                            strLastActualErrorDesc = Utf8StrFmt("%s: Processing the downloaded object was failed. "
+                                    "The exception (%Rrc)\n", __FUNCTION__, hrc);
+                            LogRel((strLastActualErrorDesc.c_str()));
                         }
 
-                        /* Don't forget to release all resources */
-                        RTVfsFileRelease(hVfsDstFile);
-                        RTVfsIoStrmReadAllFree(pvBuffered, cbBuffered);
-
-                        /*re-throw the error */
-                        if (FAILED(hrc))
-                            throw hrc;
-
+//                      /* Don't forget to release all resources */
+//                      RTVfsFileRelease(hVfsDstFile);
+//                      RTVfsIoStrmReadAllFree(pvBuffered, cbBuffered);
                     }
                     else
@@ -1950 +1958 @@
             hVfsFssObject = NIL_RTVFSFSSTREAM;
 
-            pTask->pProgress->SetNextOperation(BstrFmt(tr("Creating new VM '%s'", strVMName.c_str())).raw(), 50);
-            /* Create the import stack to comply OVF logic.
-             * Before we filled some other data structures which are needed by OVF logic too.*/
-            ImportStack stack(pTask->locInfo, m->pReader->m_mapDisks, pTask->pProgress, NIL_RTVFSFSSTREAM);
-            i_importMachines(stack);
+            if (SUCCEEDED(hrc))
+            {
+                pTask->pProgress->SetNextOperation(BstrFmt(tr("Creating new VM '%s'", strVMName.c_str())).raw(), 50);
+                /* Create the import stack to comply OVF logic.
+                 * Before we filled some other data structures which are needed by OVF logic too.*/
+                ImportStack stack(pTask->locInfo, m->pReader->m_mapDisks, pTask->pProgress, NIL_RTVFSFSSTREAM);
+                i_importMachines(stack);
+            }
 
         }
         catch (HRESULT aRc)
         {
-            LogRel(("%s: Cloud import (local phase) - exception occured (%Rrc).\n", __FUNCTION__, aRc));
             hrc = aRc;
+            strLastActualErrorDesc = Utf8StrFmt("%s: Cloud import (local phase) failed. "
+                    "The exception (%Rrc)\n", __FUNCTION__, hrc);
+            LogRel((strLastActualErrorDesc.c_str()));
         }
         catch (int aRc)
         {
-            LogRel(("%s: Cloud import (local phase) - exception occured (%Rrc).\n", __FUNCTION__, aRc));
             hrc = setErrorVrc(aRc);
+            strLastActualErrorDesc = Utf8StrFmt("%s: Cloud import (local phase) failed. "
+                    "The exception (%Rrc)\n", __FUNCTION__, aRc);
+            LogRel((strLastActualErrorDesc.c_str()));
         }
         catch (...)
         {
             hrc = VERR_UNRESOLVED_ERROR;
-            LogRel(("%s: Cloud import (local phase) - Unknown exception occured.\n", __FUNCTION__));
-        }
+            strLastActualErrorDesc = Utf8StrFmt("%s: Cloud import (local phase) failed. "
+                    "The exception (%Rrc)\n", __FUNCTION__, hrc);
+            LogRel((strLastActualErrorDesc.c_str()));
+        }
+
+        LogRel(("%s: Cloud import (local phase) final result (%Rrc).\n", __FUNCTION__, hrc));
 
         if (FAILED(hrc))
@@ -1982 +2001 @@
             if (hVfsFssObject != NIL_RTVFSFSSTREAM)
                 RTVfsFsStrmRelease(hVfsFssObject);
-
-            LogRel(("%s: Cloud import (local phase): original error was \'%s\'.\n", __FUNCTION__, strLastActualErrorDesc.c_str()));
 
             /* What to do here?