Changeset 3033 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jun 4, 2007 3:40:28 PM (18 years ago)

Author:

vboxsync

Message:

Main: Made Auto[Limited]Caller support NULL objects (for conditional management).

File:

• trunk/src/VBox/Main/include/VirtualBoxBase.h (modified) (4 diffs)

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

@@ -456 +456 @@
          *  Increases the number of callers of the given object
          *  by calling VirtualBoxBase::addCaller().
+         *
+         *  @param aObj     Object to add a caller to. If NULL, this
+         *                  instance is effectively turned to no-op (where
+         *                  rc() will return S_OK and state() will be
+         *                  NotReady).
          */
-        AutoCallerBase (VirtualBoxBaseNEXT_base *aObj) : mObj (aObj)
+        AutoCallerBase (VirtualBoxBaseNEXT_base *aObj)
+            : mObj (aObj)
+            , mRC (S_OK)
+            , mState (NotReady)
         {
-            Assert (aObj);
-            mRC = mObj->addCaller (&mState, aLimited);
+            if (mObj)
+                mRC =  mObj->addCaller (&mState, aLimited);
         }
 
@@ -470 +478 @@
         ~AutoCallerBase()
         {
-            if (SUCCEEDED (mRC))
+            if (mObj && SUCCEEDED (mRC))
                 mObj->releaseCaller();
         }
@@ -503 +511 @@
             if (SUCCEEDED (mRC))
             {
-                mObj->releaseCaller();
+                if (mObj)
+                    mObj->releaseCaller();
                 mRC = E_FAIL;
             }
@@ -515 +524 @@
         {
             Assert (!SUCCEEDED (mRC));
-            if (!SUCCEEDED (mRC))
+            if (mObj && !SUCCEEDED (mRC))
                 mRC = mObj->addCaller (&mState, aLimited);
         }