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

Timestamp:

Jul 17, 2018 7:41:21 AM (7 years ago)

Author:

vboxsync

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

123769

Message:

bugref:9152. scm issues.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (5 diffs)
• src-server/CloudClientImpl.cpp (modified) (2 diffs)
• src-server/CloudUserProfileListImpl.cpp (modified) (3 diffs)
• src-server/CloudUserProfileManagerImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -24910 +24910 @@
       <desc>
         Creates a cloud operation object for the passed profile
-        if profile name is NULL or empty string creates operation for the active profile.
-        if profile name is NULL or empty string and there is not the active profile 
-        returns "VERR_INVALID_PARAMETER"
+        if profile name is NULL or empty string creates operation for the active profile.
+        if profile name is NULL or empty string and there is not the active profile 
+        returns "VERR_INVALID_PARAMETER"
       </desc>
       <param name="profileName" type="wstring" dir="in">
@@ -24926 +24926 @@
       <param name="opId" type="uuid" mod="string" dir="return">
         <desc>
-          UUID of the operation.
-          It's used later when user chooses and runs this cloud operation
+          UUID of the operation.
+          It's used later when user chooses and runs this cloud operation
         </desc>
       </param>
@@ -24938 +24938 @@
       <param name="opId" type="uuid" mod="string" dir="in">
         <desc>
-          UUID of the operation.
+          UUID of the operation.
         </desc>
       </param>
@@ -24954 +24954 @@
       <param name="opId" type="uuid" mod="string" dir="in">
         <desc>
-          UUID of the operation.
+          UUID of the operation.
         </desc>
       </param>
@@ -25026 +25026 @@
       <param name="opId" type="uuid" mod="string" dir="in">
         <desc>
-          UUID of the operation.
+          UUID of the operation.
         </desc>
       </param>

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

@@ -155 +155 @@
         hrc = arc;
         LogRel(("Get cought an exception %d\n", hrc));
-    } 
+    }
     catch (std::bad_alloc)
     {
@@ -173 +173 @@
     LogRel(("CloudClient::getOperationParameters: %d, %s\n", aCloudOperation, aJsonString.c_str()));
     HRESULT hrc = VERR_NOT_IMPLEMENTED;
-    /*
-     
-    createCloudAPI
-    */
+
     return hrc;
 }

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

@@ -42 +42 @@
 }
 
-SimpleConfigFile::~SimpleConfigFile() 
+SimpleConfigFile::~SimpleConfigFile()
 {
     LogRel(("SimpleConfigFile::~SimpleConfigFile()\n"));
@@ -367 +367 @@
     if (SUCCEEDED(hrc))
     {
+        ComObjPtr<CloudClientOCI> ptrCloudClientOCI;
+        hrc = ptrCloudClientOCI.createObject();
         AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS);
-        hrc = ptrCloudClient->initCloudClient(this, mParent, providerId, aProfileName);
+        hrc = ptrCloudClientOCI->initCloudClient(this, mParent, providerId, aProfileName);
         if (SUCCEEDED(hrc))
         {
+            ptrCloudClient = ptrCloudClientOCI;
             hrc = ptrCloudClient.queryInterfaceTo(aCloudClient.asOutParam());
         }
@@ -430 +433 @@
 }
 
-HRESULT OCIUserProfileList::updateProfile(const com::Utf8Str &aProfileName, 
+HRESULT OCIUserProfileList::updateProfile(const com::Utf8Str &aProfileName,
                                           const std::vector<com::Utf8Str> &aNames,
                                           const std::vector<com::Utf8Str> &aValues)

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

@@ -104 +104 @@
 }
 
-HRESULT CloudUserProfileManager::getProfilesByProvider(CloudProviderId_T aProviderType, 
+HRESULT CloudUserProfileManager::getProfilesByProvider(CloudProviderId_T aProviderType,
                                                        ComPtr<ICloudUserProfileList> &aProfiles)
 {