From 33850b13d0933f36624e8f75211c16335e544c5d Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Fri, 29 May 2020 13:39:14 +0100
Subject: [PATCH] If GetControllerTypeInternal falls back to creating an
 instance, it should also release it (#8196)

---
 src/Umbraco.Web/Mvc/ControllerFactoryExtensions.cs | 5 ++++-
 src/Umbraco.Web/Mvc/MasterControllerFactory.cs     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Mvc/ControllerFactoryExtensions.cs b/src/Umbraco.Web/Mvc/ControllerFactoryExtensions.cs
index 07a3f2a5e3..eb39cb8faa 100644
--- a/src/Umbraco.Web/Mvc/ControllerFactoryExtensions.cs
+++ b/src/Umbraco.Web/Mvc/ControllerFactoryExtensions.cs
@@ -25,7 +25,10 @@ namespace Umbraco.Web.Mvc
 
             //we have no choice but to instantiate the controller
             var instance = factory.CreateController(requestContext, controllerName);
-            return instance?.GetType();
+            var controllerType = instance?.GetType();
+            factory.ReleaseController(instance);
+
+            return controllerType;
         }
     }
 }
diff --git a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
index 6d2f1ce501..79d0a9aa63 100644
--- a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
+++ b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
@@ -81,7 +81,10 @@ namespace Umbraco.Web.Mvc
 
                 //we have no choice but to instantiate the controller
                 var instance = factory.CreateController(requestContext, controllerName);
-                return instance?.GetType();
+                var controllerType = instance?.GetType();
+                factory.ReleaseController(instance);
+
+                return controllerType;
             }
 
             return GetControllerType(requestContext, controllerName);