Changeset 23841 in vbox

Timestamp:

Oct 17, 2009 7:07:43 PM (15 years ago)

Author:

vboxsync

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

53599

Message:

Main: Fixed assertion and double error message when cancelling a teleporter waiting for incoming connections.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• ConsoleImplTeleporter.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6762 +6762 @@
                 }
                 else if (task->mTeleporterEnabled)
+                {
                     /* -> ConsoleImplTeleporter.cpp */
                     vrc = console->teleporterTrg(pVM, pMachine, task->mStartPaused, task->mProgress);
+                    if (RT_FAILURE(vrc))
+                        rc = E_FAIL;    /* Avoid the "Missing error message..." assertion. */
+                }
                 else if (task->mStartPaused)
                     /* done */
@@ -6821 +6825 @@
             {
                 /* If the error message is not set but we've got a failure,
-                 * convert the VBox status code into a meaningfulerror message.
+                 * convert the VBox status code into a meaningful error message.
                  * This becomes unused once all the sources of errors set the
                  * appropriate error message themselves.

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -816 +816 @@
  *                              Running (false) state,
  * @param   pProgress           Pointer to the progress object.
+ *
+ * @remarks The caller expects error information to be set on failure.
+ * @todo    Check that all the possible failure paths sets error info...
  */
 int
@@ -918 +921 @@
                 else if (vrc == VERR_TCP_SERVER_SHUTDOWN)
                 {
-                    /** @todo this crap isn't work right wrt error info. Aaaarrrg! */
                     BOOL fCancelled = TRUE;
                     hrc = pProgress->COMGETTER(Canceled)(&fCancelled);
@@ -931 +933 @@
                         vrc = VERR_TIMEOUT;
                     }
-                    pProgress->setResultCode(E_FAIL); /* ugly! */
                     LogRel(("Teleporter: RTTcpServerListen aborted - %Rrc\n", vrc));
                     fPowerOff = true;