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

Timestamp:

Oct 15, 2013 2:53:02 AM (11 years ago)

Author:

vboxsync

Message:

Main/NATNetwork: reorder saving settings and firing change events, release lock after settings savings.

File:

• trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp

@@ -660 +660 @@
                                             USHORT aGuestPort)
 {
-    int rc = S_OK;
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -709 +708 @@
 
     alock.release();
+
+#ifdef NAT_XML_SERIALIZATION
+    AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
+    HRESULT rc = mVirtualBox->saveSettings();
+    ComAssertComRCRetRC(rc);
+    vboxLock.release();
+#endif
+
     mVirtualBox->onNATNetworkPortForward(mName.raw(), TRUE, aIsIpv6,
                                          aPortForwardRuleName, aProto,
@@ -719 +726 @@
                                    aHostIp, aHostPort,
                                    aGuestIp, aGuestPort);
-
-#ifdef NAT_XML_SERIALIZATION
-    AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
-    rc = mVirtualBox->saveSettings();
-#endif
-    return rc;
+    return S_OK;
 }
 
@@ -749 +751 @@
     alock.release();
 
+#ifdef NAT_XML_SERIALIZATION
+    AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
+    HRESULT rc = mVirtualBox->saveSettings();
+    ComAssertComRCRetRC(rc);
+    vboxLock.release();
+#endif
+
     mVirtualBox->onNATNetworkPortForward(mName.raw(), FALSE, aIsIpv6,
                                          aPortForwardRuleName, proto,
@@ -759 +768 @@
                                    Bstr(strHostIP).raw(), u16HostPort,
                                    Bstr(strGuestIP).raw(), u16GuestPort);
-    HRESULT rc = S_OK;
-#ifdef NAT_XML_SERIALIZATION
-    AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
-    rc = mVirtualBox->saveSettings();
-#endif
-
-    return rc;
+    return S_OK;
 }