Merge branch 'dev'

Velir · Apr 28, 2016 · be4a42e · be4a42e
2 parents ba880db + b854a29
commit be4a42e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Factories/Providers/MvcLifetimeScopeProvider.cs b/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Factories/Providers/MvcLifetimeScopeProvider.cs
@@ -8,7 +8,14 @@ public class MvcLifetimeScopeProvider : ILifetimeScopeProvider
     {
         public ILifetimeScope GetLifetimeScope()
         {
-            return AutofacDependencyResolver.Current?.RequestLifetimeScope;
+            try
+            {
+                return AutofacDependencyResolver.Current?.RequestLifetimeScope;
+            }
+            catch
+            {
+                return null;
+            }
         }
     }
 }
diff --git a/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs b/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
 
 [assembly: InternalsVisibleTo("Jabberwocky.Glass.Autofac.Mvc.Tests")]
diff --git a/...erwocky.Glass.Autofac.WebApi/Pipelines/Factories/Providers/WebApiLifetimeScopeProvider.cs b/...erwocky.Glass.Autofac.WebApi/Pipelines/Factories/Providers/WebApiLifetimeScopeProvider.cs
@@ -10,10 +10,17 @@ public class WebApiLifetimeScopeProvider : ILifetimeScopeProvider
     {
         public ILifetimeScope GetLifetimeScope()
         {
-            // If using the Autofac.WebApi integration package, this dependency should be of type 'AutofacWebApiDependencyResolver'
-            var resolver = GlobalConfiguration.Configuration.DependencyResolver as IDependencyScope;
+            try
+            {
+                // If using the Autofac.WebApi integration package, this dependency should be of type 'AutofacWebApiDependencyResolver'
+                var resolver = GlobalConfiguration.Configuration.DependencyResolver as IDependencyScope;
 
-            return resolver?.GetRequestLifetimeScope();
+                return resolver?.GetRequestLifetimeScope();
+            }
+            catch
+            {
+                return null;
+            }
         }
     }
 }
diff --git a/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs b/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]