From 50d22d2dee85e203c2d91e2add8eff1607ab4fe5 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Wed, 23 Jan 2013 16:12:13 -0500 Subject: [PATCH] Fix for "Object reference error" with WebSitesHeliconApe --- .../WebSitesHeliconApeControl.ascx.cs | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.cs index d56ffa5f..ede3f300 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.cs @@ -53,7 +53,20 @@ namespace WebsitePanel.Portal private HeliconApeStatus HeliconApeStatus { - get { return (HeliconApeStatus)ViewState["HeliconApeStatus"]; } + get + { + if (null == ViewState["HeliconApeStatus"]) + { + HeliconApeStatus nullstatus = new HeliconApeStatus(); + return nullstatus; + } + else + { + return (HeliconApeStatus)ViewState["HeliconApeStatus"]; + } + + + } set { ViewState["HeliconApeStatus"] = value; } } @@ -91,17 +104,23 @@ namespace WebsitePanel.Portal // Render a warning message about the automatic site's settings change - if (!HeliconApeStatus.IsEnabled && site.IIs7) + if (site.IIs7) { - // Ensure the message is displayed only when neccessary - if (site.EnableWindowsAuthentication || !site.AspNetInstalled.EndsWith("I") || site.SecuredFoldersInstalled) + if (!HeliconApeStatus.IsEnabled) { - // TODO: show warning, do not force to enable integrated pool - string warningStr = GetLocalizedString("EnableFoldersIIs7Warning.Text"); - // Render a warning only if specified - if (!String.IsNullOrEmpty(warningStr)) - btnToggleHeliconApe.OnClientClick = String.Format("return confirm('{0}')", warningStr); + // Ensure the message is displayed only when neccessary + if (site.EnableWindowsAuthentication || !site.AspNetInstalled.EndsWith("I") || site.SecuredFoldersInstalled) + { + // TODO: show warning, do not force to enable integrated pool + string warningStr = GetLocalizedString("EnableFoldersIIs7Warning.Text"); + // Render a warning only if specified + if (!String.IsNullOrEmpty(warningStr)) + btnToggleHeliconApe.OnClientClick = String.Format("return confirm('{0}')", warningStr); + } + + } + } // toggle ToggleControls();