Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-289959: Add null checks when resolving the updates which require reboot

Browse Source 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2018-05-17 11:25:07 +01:00 committed by Konstantina Chremmou
parent 171284ff34
commit 5ad2aa302e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Diagnostics/Checks/RebootPendingOnMasterCheck.cs
View File

@ -70,7 +70,7 @@ namespace XenAdmin.Diagnostics.Checks
var update = Host.Connection.Resolve(updateRef); var update = Host.Connection.Resolve(updateRef);
if (string.IsNullOrEmpty(UpdateUuid) || //automated mode, any update if (string.IsNullOrEmpty(UpdateUuid) || //automated mode, any update
string.Equals(update.uuid, UpdateUuid, System.StringComparison.InvariantCultureIgnoreCase)) //normal mode the given update (update != null && string.Equals(update.uuid, UpdateUuid, System.StringComparison.InvariantCultureIgnoreCase))) //normal mode the given update
{ {
return new MasterIsPendingRestartHostProblem(this, pool); return new MasterIsPendingRestartHostProblem(this, pool);
} }

3
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -1820,7 +1820,8 @@ namespace XenAdmin.TabPages
foreach (var updateRef in updateRefs) foreach (var updateRef in updateRefs)
{ {
var update = host.Connection.Resolve(updateRef); var update = host.Connection.Resolve(updateRef);
warnings.Add(CreateWarningRow(host, update)); if (update != null)
warnings.Add(CreateWarningRow(host, update));
} }
// For Toolstack restart, legacy code has to be used to determine this - pool_patches are still populated for backward compatibility // For Toolstack restart, legacy code has to be used to determine this - pool_patches are still populated for backward compatibility