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

CA-188554: XenCenter Error Uncaught exception System.NullReferenceException

Browse Source 
changes following code review

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2015-11-25 12:32:04 +00:00
parent 2e8e7afb7e
commit 729b69382e
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -102,20 +102,18 @@ namespace XenAdmin.TabPages
GeneralTabLicenseStatusStringifier ss = new GeneralTabLicenseStatusStringifier(licenseStatus);
Program.Invoke(Program.MainWindow, () =>
{
if (pdSectionLicense != null)
pdSectionLicense.UpdateEntryValueWithKey(
FriendlyName("host.license_params-expiry"),
ss.ExpiryDate,
ss.ShowExpiryDate);
pdSectionLicense.UpdateEntryValueWithKey(
FriendlyName("host.license_params-expiry"),
ss.ExpiryDate,
ss.ShowExpiryDate);
});
Program.Invoke(Program.MainWindow, () =>
{
if (pdSectionLicense != null)
pdSectionLicense.UpdateEntryValueWithKey(
Messages.LICENSE_STATUS,
ss.ExpiryStatus,
true);
pdSectionLicense.UpdateEntryValueWithKey(
Messages.LICENSE_STATUS,
ss.ExpiryStatus,
true);
});
}
@ -166,10 +164,7 @@ namespace XenAdmin.TabPages
if (value == null)
return;
UnregisterLicenseStatusUpdater();
if (value is Host || value is Pool)
SetupAndStartLicenseStatus(value);
RegisterLicenseStatusUpdater(xenObject);
if (xenObject != value)
{
@ -191,19 +186,17 @@ namespace XenAdmin.TabPages
}
}
private void SetupAndStartLicenseStatus(IXenObject xo)
{
System.Diagnostics.Debug.Assert(xo is Host || xo is Pool);
licenseStatus = new LicenseStatus(xo);
licenseStatus.ItemUpdated += licenseStatus_ItemUpdated;
licenseStatus.BeginUpdate();
}
private void UnregisterLicenseStatusUpdater()
private void RegisterLicenseStatusUpdater(IXenObject xenObject)
{
if (licenseStatus != null)
licenseStatus.ItemUpdated -= licenseStatus_ItemUpdated;
if (xenObject is Host || xenObject is Pool)
{
licenseStatus = new LicenseStatus(xenObject);
licenseStatus.ItemUpdated += licenseStatus_ItemUpdated;
licenseStatus.BeginUpdate();
}
}
void s_ExpandedEventHandler(PDSection pdSection)