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

Timestamp:

Jun 7, 2010 1:06:51 PM (15 years ago)

Author:

vboxsync

Message:

Main/VirtualBox: handle objects with limited functionality consistently when searching by name or uuid - skip them.

File:

• trunk/src/VBox/Main/VirtualBoxImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1350 +1350 @@
     {
         ComObjPtr<Machine> &pMachine2 = *it;
-        AutoLimitedCaller machCaller(pMachine2);
-        AssertComRC(machCaller.rc());
-
+        AutoCaller machCaller(pMachine2);
         /* skip inaccessible machines */
-        if (machCaller.state() == Machine::Ready)
-        {
-            AutoReadLock machLock(pMachine2 COMMA_LOCKVAL_SRC_POS);
-            if (pMachine2->getName() == aName)
-            {
-                pMachineFound = pMachine2;
-                break;
-            }
+        if (FAILED(machCaller.rc()))
+            continue;
+
+        AutoReadLock machLock(pMachine2 COMMA_LOCKVAL_SRC_POS);
+        if (pMachine2->getName() == aName)
+        {
+            pMachineFound = pMachine2;
+            break;
         }
     }
@@ -2922 +2920 @@
         {
             ComObjPtr<Machine> pMachine2 = *it;
-            /* sanity */
-            AutoLimitedCaller machCaller(pMachine2);
-            AssertComRC(machCaller.rc());
+            AutoCaller machCaller(pMachine2);
+            /* skip inaccessible machines */
+            if (FAILED(machCaller.rc()))
+                continue;
 
             if (pMachine2->getId() == aId)
@@ -2937 +2936 @@
 
     if (aSetError && FAILED(rc))
-        setError(VBOX_E_OBJECT_NOT_FOUND,
-                 tr("Could not find a registered machine with UUID {%RTuuid}"),
-                 aId.raw());
+        rc = setError(rc,
+                      tr("Could not find a registered machine with UUID {%RTuuid}"),
+                      aId.raw());
 
     return rc;