Fixed #145

Author: ENikS

src/Extensions/DiagnosticExtensions.cs

@@ -12,7 +12,7 @@ public static class DiagnosticExtensions
         /// <para>This extension method adds <see cref="Diagnostic"/> extension to the 
         /// container and enables extended validation for all container's operations.</para>
         /// <para>This method will only work if the calling code is built with DEBUG
-        /// symbol defined. In other word in you building in Debug mode. Condigional 
+        /// symbol defined. In other word in you building in Debug mode. Conditional 
         /// methods can not return any values, so fluent notation can not be used with 
         /// this method.</para>
         /// </remarks>
@@ -39,7 +39,7 @@ public static void EnableDebugDiagnostic(this UnityContainer container)
         /// <remarks>
         /// <para>This extension method adds <see cref="Diagnostic"/> extension to the 
         /// container and enables extended validation for all container's operations.</para>
-        /// <para>This method works regardles of build mode. In other word, it will 
+        /// <para>This method works regardless of the build mode. In other word, it will 
         /// always enable validation. This method could be used with fluent notation.</para>
         /// </remarks>
         /// <example>

src/Strategies/BuildPlanStrategy.cs

@@ -41,7 +41,10 @@ public override bool RequiredToBuildType(IUnityContainer container, Type type, I
         public override void PreBuildUp(ref BuilderContext context)
         {
             // Get resolver if already created
-            var resolver = context.Registration.Get<ResolveDelegate<BuilderContext>>();
+            var resolver = context.Registration.Get<ResolveDelegate<BuilderContext>>() ?? (ResolveDelegate<BuilderContext>)(
+                           context.Get(context.Type, UnityContainer.All, typeof(ResolveDelegate<BuilderContext>)) ??
+                           GetGeneric(ref context, typeof(ResolveDelegate<BuilderContext>)));
+
             if (null == resolver)
             {
                 // Check if can create at all
@@ -59,9 +62,9 @@ public override void PreBuildUp(ref BuilderContext context)
 
                 // Get resolver factory
                 var factory = context.Registration.Get<ResolveDelegateFactory>() ?? (ResolveDelegateFactory)(
-                               context.Get(context.Type, UnityContainer.All, typeof(ResolveDelegateFactory)) ??
-                               GetGeneric(ref context, typeof(ResolveDelegateFactory)) ?? 
-                               context.Get(null, null, typeof(ResolveDelegateFactory)));
+                              context.Get(context.Type, UnityContainer.All, typeof(ResolveDelegateFactory)) ??
+                              GetGeneric(ref context, typeof(ResolveDelegateFactory)) ?? 
+                              context.Get(null, null, typeof(ResolveDelegateFactory)));
 
                 // Create plan 
                 if (null != factory)