Changeset 16926 in vbox

Timestamp:

Feb 18, 2009 5:26:40 PM (16 years ago)

Author:

vboxsync

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

43057

Message:

OVF: fix session handling (code failed if machine had more than one disk image attached); fix broken error reporting (null string passed with %d)

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1654 +1654 @@
 DECLCALLBACK(int) Appliance::taskThread(RTTHREAD aThread, void *pvUser)
 {
-    std::auto_ptr <Task> task(static_cast<Task *>(pvUser));
+    std::auto_ptr<Task> task(static_cast<Task *>(pvUser));
     AssertReturn(task.get(), VERR_GENERAL_FAILURE);
 
@@ -1921 +1921 @@
                    the machine, so make an extra try/catch block. */
                 ComPtr<ISession> session;
+                bool fSessionOpen = false;
                 ComPtr<IHardDisk> srcHdVBox;
+
                 try
                 {
@@ -1930 +1932 @@
                     rc = app->mVirtualBox->OpenSession(session, newMachineId);
                     CheckComRCThrowRC(rc);
+                    fSessionOpen = true;
 
                     int result;
@@ -2027 +2030 @@
                                 /* This isn't allowed */
                                 throw setError(VBOX_E_FILE_ERROR,
-                                               tr("Source virtual disk image file '%s' doesn't exists",
-                                                  strSrcFilePath.c_str()));
+                                               tr("Source virtual disk image file '%s' doesn't exist"),
+                                                  strSrcFilePath.c_str());
                             /* Clone the disk image (this is necessary cause the id has
                              * to be recreated for the case the same hard disk is
@@ -2100 +2103 @@
                         rc = sMachine->SaveSettings();
                         CheckComRCThrowRC(rc);
-                        rc = session->Close();
-                        CheckComRCThrowRC(rc);
-                    }
+                    } // end for (itHD = avsdeHDs.begin();
+
+                    // only now that we're done with all disks, close the session
+                    rc = session->Close();
+                    CheckComRCThrowRC(rc);
                 }
                 catch(HRESULT aRC)