From 0b0784d40c7def2d7d2c76a23af1c492412fef68 Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 4 Feb 2013 16:10:43 -0100 Subject: [PATCH] U4-1441 - fix NotFoundHandler assembly loading --- src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs index 082e28c35a..46c6cef456 100644 --- a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs +++ b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs @@ -110,10 +110,7 @@ namespace Umbraco.Web.Routing Type type = null; try { - //TODO: This isn't a good way to load the assembly, its already in the Domain so we should be getting the type - // this loads the assembly into the wrong assembly load context!! - - var assembly = Assembly.LoadFrom(Umbraco.Core.IO.IOHelper.MapPath(Umbraco.Core.IO.SystemDirectories.Bin + "/" + assemblyName + ".dll")); + var assembly = Assembly.Load(new AssemblyName(assemblyName)); type = assembly.GetType(ns + "." + typeName); } catch (Exception e)