Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1128 from GaborApatiNagy/REQ-156_github

Browse Source 
CA-217232: Fixed regression caused by the fix for CA-216935
This commit is contained in:
Konstantina Chremmou 2016-08-19 10:42:41 +01:00 committed by GitHub
commit 0cd8391feb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XenAdmin/Wizards/PatchingWizard/PlanActions/PoolPatchMapping.cs
View File

@ -32,15 +32,15 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
public override bool Equals(object obj) public override bool Equals(object obj)
{ {
if (!(obj is PoolPatchMapping))
return false;
var that = obj as PoolPatchMapping; var that = obj as PoolPatchMapping;
if (that == null)
return false;
return return
this.XenServerPatch == that.XenServerPatch this.XenServerPatch != null && this.XenServerPatch.Equals(that.XenServerPatch)
&& this.Pool_patch == that.Pool_patch && this.Pool_patch != null && this.Pool_patch.Equals(that.Pool_patch)
&& this.MasterHost == that.MasterHost; && this.MasterHost != null && that.MasterHost != null & this.MasterHost.uuid == that.MasterHost.uuid;
} }
public override int GetHashCode() public override int GetHashCode()

2
XenAdmin/Wizards/PatchingWizard/PlanActions/UploadPatchToMasterPlanAction.cs
View File

@ -65,7 +65,7 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
var conn = session.Connection; var conn = session.Connection;
var master = Helpers.GetMaster(conn); var master = Helpers.GetMaster(conn);
var existingMapping = mappings.Find(m => m.MasterHost.uuid == master.uuid && m.Pool_patch != null && m.XenServerPatch == patch); var existingMapping = mappings.Find(m => m.MasterHost.uuid == master.uuid && m.Pool_patch != null && m.XenServerPatch.Equals(patch));
if (existingMapping == null if (existingMapping == null
|| !poolPatches.Any(p => string.Equals(p.uuid, existingMapping.Pool_patch.uuid, StringComparison.OrdinalIgnoreCase))) || !poolPatches.Any(p => string.Equals(p.uuid, existingMapping.Pool_patch.uuid, StringComparison.OrdinalIgnoreCase)))