Fix Deployment Get Func

Author: huangpf

src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs

@@ -159,9 +159,9 @@ public virtual void NewPaaSDeploymentProcess()
                     }
                 }
 
-                Action<DeploymentSlot, DeploymentGetResponse> func = (t, d) =>
+                Func<DeploymentSlot, DeploymentGetResponse> func = t =>
                 {
-                    d = null;
+                    DeploymentGetResponse d = null;
                     try
                     {
                         d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, t);
@@ -173,15 +173,17 @@ public virtual void NewPaaSDeploymentProcess()
                             this.WriteExceptionDetails(ex);
                         }
                     }
+
+                    return d;
                 };
 
                 var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);
                 DeploymentGetResponse currentDeployment = null;
-                InvokeInOperationContext(() => func(slotType, currentDeployment));
+                InvokeInOperationContext(() => currentDeployment = func(slotType));
 
                 var peerSlottype = slotType == DeploymentSlot.Production ? DeploymentSlot.Staging : DeploymentSlot.Production;
                 DeploymentGetResponse peerDeployment = null;
-                InvokeInOperationContext(() => func(slotType, peerDeployment));
+                InvokeInOperationContext(() => peerDeployment = func(peerSlottype));
 
                 ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName);
                 extConfig = extensionMgr.Set(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot);

src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs

@@ -164,9 +164,9 @@ public void ExecuteCommand()
                     }
                 }
 
-                Action<DeploymentSlot, DeploymentGetResponse> func = (t, d) =>
+                Func<DeploymentSlot, DeploymentGetResponse> func = t =>
                 {
-                    d = null;
+                    DeploymentGetResponse d = null;
                     try
                     {
                         d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, t);
@@ -178,15 +178,17 @@ public void ExecuteCommand()
                             this.WriteExceptionDetails(ex);
                         }
                     }
+
+                    return d;
                 };
 
                 var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);
                 DeploymentGetResponse currentDeployment = null;
-                InvokeInOperationContext(() => func(slotType, currentDeployment));
+                InvokeInOperationContext(() => currentDeployment = func(slotType));
 
                 var peerSlottype = slotType == DeploymentSlot.Production ? DeploymentSlot.Staging : DeploymentSlot.Production;
                 DeploymentGetResponse peerDeployment = null;
-                InvokeInOperationContext(() => func(slotType, peerDeployment));
+                InvokeInOperationContext(() => peerDeployment = func(peerSlottype));
 
                 ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName);
                 extConfig = extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot);