From 2be330d2373595d64eadbc9a0225929a6fc1987b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 28 Apr 2017 07:45:01 +1000
Subject: [PATCH] adds notes, changes to protected

---
 .../Mvc/UmbracoVirtualNodeRouteHandler.cs     | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
index e7a004fddf..df64d5e75e 100644
--- a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
@@ -17,9 +17,27 @@ namespace Umbraco.Web.Mvc
         /// Returns the UmbracoContext for this route handler
         /// </summary>
         /// <remarks>
-        /// By default this uses the UmbracoContext singleton
+        /// By default this uses the UmbracoContext singleton, this could be overridden to check for null in the case
+        /// that this handler is used for a request where an UmbracoContext is not created by default see http://issues.umbraco.org/issue/U4-9384
+        /// <example>
+        /// <![CDATA[
+        /// protected override UmbracoContext GetUmbracoContext(RequestContext requestContext)
+        /// {
+        ///    var ctx = base.GetUmbracoContext(requestContext);
+        ///    //check if context is null, we know it will be null if we are dealing with a request that
+        ///    //has an extension and by default no Umb ctx is created for the request
+        ///    if (ctx == null) {
+        ///        //TODO: Here you can EnsureContext , please note that the requestContext is passed in 
+        ///        //therefore your should refrain from using other singletons like HttpContext.Current since
+        ///        //you will already have a reference to it. Also if you need an ApplicationContext you should
+        ///        //pass this in via a ctor instead of using the ApplicationContext.Current singleton.
+        ///    }
+        ///    return ctx;
+        /// }
+        /// ]]>
+        /// </example>
         /// </remarks>
-        public virtual UmbracoContext GetUmbracoContext(RequestContext requestContext)
+        protected virtual UmbracoContext GetUmbracoContext(RequestContext requestContext)
         {
             return UmbracoContext.Current;
         }