Merge pull request #6869 from dimarobert/install-locker

Prevent the installBlocker lock file to be removed by subsequent requests during Upgrade or Install.

Author: valadas

DNN Platform/Website/Install/Install.aspx.cs

@@ -224,6 +224,7 @@ private void InstallApplication()
             }
             else
             {
+                bool cleanupLocker = false;
                 try
                 {
                     var synchConnectionString = new SynchConnectionStringStep();
@@ -259,6 +260,7 @@ private void InstallApplication()
                                 return;
                             }
 
+                            cleanupLocker = true;
                             RegisterInstallBegining();
                         }
 
@@ -314,7 +316,10 @@ private void InstallApplication()
                 }
                 finally
                 {
-                    RegisterInstallEnd();
+                    if (cleanupLocker)
+                    {
+                        RegisterInstallEnd();
+                    }
                 }
             }
         }
@@ -352,6 +357,7 @@ private bool CheckPermissions()
 
         private void UpgradeApplication()
         {
+            bool cleanupLocker = false;
             try
             {
                 if (Upgrade.Upgrade.RemoveInvalidAntiForgeryCookie())
@@ -377,6 +383,7 @@ private void UpgradeApplication()
                         return;
                     }
 
+                    cleanupLocker = true;
                     RegisterInstallBegining();
                 }
 
@@ -498,7 +505,10 @@ private void UpgradeApplication()
             }
             finally
             {
-                RegisterInstallEnd();
+                if (cleanupLocker)
+                {
+                    RegisterInstallEnd();
+                }
             }
         }