Changeset 5642 in vbox

Timestamp:

Nov 8, 2007 11:07:42 AM (17 years ago)

Author:

vboxsync

Message:

Main: Return an error when two machines witht he same UUID are detected in the global registry instead of asserting.

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxImpl.cpp (modified) (2 diffs)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -2983 +2983 @@
              ++ it)
         {
+            /* sanity */
             AutoLimitedCaller machCaller (*it);
             AssertComRC (machCaller.rc());
@@ -3894 +3895 @@
     AutoLock alock (this);
 
-    ComAssertRet (findMachine (aMachine->uuid(),
-                  false /* aDoSetError  */, NULL) == E_INVALIDARG,
-                  E_FAIL);
-
     HRESULT rc = S_OK;
+
+    {
+        ComObjPtr <Machine> m;
+        rc = findMachine (aMachine->uuid(), false /* aDoSetError */, &m);
+        if (SUCCEEDED (rc))
+        {
+            /* sanity */
+            AutoLimitedCaller machCaller (m);
+            AssertComRC (machCaller.rc());
+
+            return setError (E_INVALIDARG,
+                tr ("Registered machine with UUID {%Vuuid} ('%ls') already exists"),
+                aMachine->uuid().raw(), m->settingsFileFull().raw());
+        }
+
+        ComAssertRet (rc == E_INVALIDARG, rc);
+        rc = S_OK;
+    }
 
     if (autoCaller.state() != InInit)

trunk/src/VBox/Main/include/MachineImpl.h

@@ -530 +530 @@
 
     /** 
+     *  Returns this machine's full settings file path.
+     *
+     *  @note This method doesn't lock this object or check its readiness as
+     *  it is intended to be used only after adding a caller to this object
+     *  (that guarantees that the object is ready) and locking it for reading.
+     */
+    const Bstr &settingsFileFull() const { return mData->mConfigFileFull; }
+
+    /** 
      *  Returns this machine's name.
      *