Merge pull request #27 from brandondahler/bugfix/Initialization

Make initialization of bootstraper a startup task instead of a per-request task.

Author: scott-xu

src/Ninject.Web.Common.OwinHost/OwinAppBuilderExtensions.cs

@@ -19,8 +19,10 @@
 
 namespace Ninject.Web.Common.OwinHost
 {
-    using System;
-
+    using System;
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+
     using Owin;
 
     /// <summary>
@@ -51,7 +53,10 @@ public static IAppBuilder UseNinjectMiddleware(this IAppBuilder app, Func<IKerne
 
             app.Properties.Add(NinjectOwinBootstrapperKey, bootstrapper);
 
-            return app.Use(bootstrapper.Execute);
+
+            var middleware = new Func<Func<IDictionary<string, object>, Task>, Func<IDictionary<string, object>, Task>>(bootstrapper.Execute);
+
+            return app.Use(middleware);
         }  
     }
 }

src/Ninject.Web.Common.OwinHost/OwinBootstrapper.cs

@@ -63,22 +63,17 @@ public OwinBootstrapper(Func<IKernel> createKernel)
             this.createKernel = createKernel;
         }
 
-        /// <summary>
-        /// The execute.
-        /// </summary>
-        /// <param name="context">
-        /// The context.
-        /// </param>
-        /// <param name="next">
-        /// The next.
-        /// </param>
+        /// <summary>
+        /// The execute.
+        /// </summary>
+        /// <param name="next">The next.</param>
         /// <returns>
-        /// The <see cref="Task"/>.
+        /// The <see cref="Func{IDictionary{string, object}, Task}"/>.
         /// </returns>
-        public async Task Execute(IOwinContext context, Func<Task> next)
-        {
-            if (this.bootstrapper == null)
-            {
+        public Func<IDictionary<string, object>, Task> Execute(Func<IDictionary<string, object>, Task> next)
+        {
+            if (this.bootstrapper == null)
+            {
                 lock (this.modules)
                 {
                     if (this.bootstrapper == null)
@@ -88,13 +83,15 @@ public async Task Execute(IOwinContext context, Func<Task> next)
                         this.bootstrapper = initializingBootstrapper;
                     }
                 }
-            }
+            }
 
-            using (var scope = new OwinRequestScope())
-            {
-                context.Set(NinjectOwinRequestScope, scope);
-                await next();
-            }
+            return async (context) => {
+                using (var scope = new OwinRequestScope())
+                {
+                    context[NinjectOwinRequestScope] = scope;
+                    await next(context);
+                }
+            };
         }
 
         /// <summary>