Merge pull request #7878 from wastoresh/filcopycontext

[Storage] Fix Start-AzureStorageFileCopy can't resue source context in destination when not input -DestContext

Author: cormacpayne

src/Storage/Commands.Storage/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue that Copy File cmdlet can't reuse source context in destination when not input -DestContext
+    - Start-AzureStorageFileCopy
 * Support Static Website configuration
     - Enable-AzureStorageStaticWebsite
     - Disable-AzureStorageStaticWebsite

src/Storage/Commands.Storage/File/Cmdlet/StartAzureStorageFileCopy.cs

@@ -188,8 +188,6 @@ internal IStorageFileManagement GetDestinationChannel()
 
             if (destChannel == null)
             {
-                AzureStorageContext context = null;
-
                 if (ContainerNameParameterSet == this.ParameterSetName ||
                     ContainerParameterSet == this.ParameterSetName ||
                     BlobFilePathParameterSet == this.ParameterSetName ||
@@ -198,14 +196,26 @@ internal IStorageFileManagement GetDestinationChannel()
                     FileFilePathParameterSet == this.ParameterSetName ||
                     UriFilePathParameterSet == this.ParameterSetName)
                 {
-                    context = this.GetCmdletStorageContext(DestContext);
+                    if (DestContext == null)
+                    {
+                        if (Channel != null)
+                        {
+                            destChannel = Channel;
+                        }
+                        else
+                        {
+                            destChannel = base.CreateChannel();
+                        }
+                    }
+                    else
+                    {
+                        destChannel = new StorageFileManagement(this.GetCmdletStorageContext(DestContext));
+                    }
                 }
                 else
                 {
-                    context = AzureStorageContext.EmptyContextInstance;
+                    destChannel = base.CreateChannel();
                 }
-
-                destChannel = new StorageFileManagement(context);
             }
 
             return destChannel;