Merge branch 'master' into bait-switch

jamesloi · Jun 5, 2015 · 2bdbd4c · 2bdbd4c
2 parents cd25c79 + e94cbae
commit 2bdbd4c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/src/Ninject/Activation/Caching/ActivationCache.cs b/src/Ninject/Activation/Caching/ActivationCache.cs
@@ -39,6 +39,7 @@ public class ActivationCache : NinjectComponent, IActivationCache, IPruneable
         /// <param name="cachePruner">The cache pruner.</param>
         public ActivationCache(ICachePruner cachePruner)
         {
+            Ensure.ArgumentNotNull(cachePruner, "cachePruner");
             cachePruner.Start(this);
         }
 

diff --git a/src/Ninject/Activation/Pipeline.cs b/src/Ninject/Activation/Pipeline.cs
@@ -36,6 +36,7 @@ public class Pipeline : NinjectComponent, IPipeline
         public Pipeline(IEnumerable<IActivationStrategy> strategies, IActivationCache activationCache)
         {
             Ensure.ArgumentNotNull(strategies, "strategies");
+            Ensure.ArgumentNotNull(activationCache, "activationCache");
             this.Strategies = strategies.ToList();
             this.activationCache = activationCache;
         }
@@ -53,6 +54,7 @@ public Pipeline(IEnumerable<IActivationStrategy> strategies, IActivationCache ac
         public void Activate(IContext context, InstanceReference reference)
         {
             Ensure.ArgumentNotNull(context, "context");
+            Ensure.ArgumentNotNull(reference, "reference");
             if (!this.activationCache.IsActivated(reference.Instance))
             {
                 this.Strategies.Map(s => s.Activate(context, reference));
@@ -67,6 +69,7 @@ public void Activate(IContext context, InstanceReference reference)
         public void Deactivate(IContext context, InstanceReference reference)
         {
             Ensure.ArgumentNotNull(context, "context");
+            Ensure.ArgumentNotNull(reference, "reference");
             if (!this.activationCache.IsDeactivated(reference.Instance))
             {
                 this.Strategies.Map(s => s.Deactivate(context, reference));

diff --git a/src/Ninject/Activation/Strategies/ActivationCacheStrategy.cs b/src/Ninject/Activation/Strategies/ActivationCacheStrategy.cs
@@ -1,6 +1,7 @@
 namespace Ninject.Activation.Strategies
 {
     using Ninject.Activation.Caching;
+    using Ninject.Infrastructure;
 
     /// <summary>
     /// Adds all activated instances to the activation cache.
@@ -18,6 +19,7 @@ public class ActivationCacheStrategy : IActivationStrategy
         /// <param name="activationCache">The activation cache.</param>
         public ActivationCacheStrategy(IActivationCache activationCache)
         {
+            Ensure.ArgumentNotNull(activationCache, "activationCache");
             this.activationCache = activationCache;
         }
 

diff --git a/src/Ninject/Modules/CompiledModuleLoaderPlugin.cs b/src/Ninject/Modules/CompiledModuleLoaderPlugin.cs
@@ -57,6 +57,7 @@ public class CompiledModuleLoaderPlugin : NinjectComponent, IModuleLoaderPlugin
         public CompiledModuleLoaderPlugin(IKernel kernel, IAssemblyNameRetriever assemblyNameRetriever)
         {
             Ensure.ArgumentNotNull(kernel, "kernel");
+            Ensure.ArgumentNotNull(assemblyNameRetriever, "assemblyNameRetriever");
             this.Kernel = kernel;
             this.assemblyNameRetriever = assemblyNameRetriever;
         }

diff --git a/src/Ninject/Syntax/ResolutionExtensions.cs b/src/Ninject/Syntax/ResolutionExtensions.cs
@@ -297,7 +297,7 @@ public static IEnumerable<object> GetAll(this IResolutionRoot root, Type service
         /// <typeparam name="T">The service to resolve.</typeparam>
         /// <param name="root">The resolution root.</param>
         /// <param name="parameters">The parameters to pass to the request.</param>
-        /// <returns>An instance of the service.</returns>
+        /// <returns><c>True</c> if the request can be resolved; otherwise, <c>false</c>.</returns>
         public static bool CanResolve<T>(this IResolutionRoot root, params IParameter[] parameters)
         {
             return CanResolve(root, typeof(T), null, parameters, false, true);
@@ -310,7 +310,7 @@ public static bool CanResolve<T>(this IResolutionRoot root, params IParameter[]
         /// <param name="root">The resolution root.</param>
         /// <param name="name">The name of the binding.</param>
         /// <param name="parameters">The parameters to pass to the request.</param>
-        /// <returns>An instance of the service.</returns>
+        /// <returns><c>True</c> if the request can be resolved; otherwise, <c>false</c>.</returns>
         public static bool CanResolve<T>(this IResolutionRoot root, string name, params IParameter[] parameters)
         {
             return CanResolve(root, typeof(T), b => b.Name == name, parameters, false, true);
@@ -323,7 +323,7 @@ public static bool CanResolve<T>(this IResolutionRoot root, string name, params
         /// <param name="root">The resolution root.</param>
         /// <param name="constraint">The constraint to apply to the binding.</param>
         /// <param name="parameters">The parameters to pass to the request.</param>
-        /// <returns>An instance of the service.</returns>
+        /// <returns><c>True</c> if the request can be resolved; otherwise, <c>false</c>.</returns>
         public static bool CanResolve<T>(this IResolutionRoot root, Func<IBindingMetadata, bool> constraint, params IParameter[] parameters)
         {
             return CanResolve(root, typeof(T), constraint, parameters, false, true);
@@ -335,8 +335,8 @@ public static bool CanResolve<T>(this IResolutionRoot root, Func<IBindingMetadat
         /// <param name="root">The resolution root.</param>
         /// <param name="service">The service to resolve.</param>
         /// <param name="parameters">The parameters to pass to the request.</param>
-        /// <returns>An instance of the service.</returns>
-        public static object CanResolve(this IResolutionRoot root, Type service, params IParameter[] parameters)
+        /// <returns><c>True</c> if the request can be resolved; otherwise, <c>false</c>.</returns>
+        public static bool CanResolve(this IResolutionRoot root, Type service, params IParameter[] parameters)
         {
             return CanResolve(root, service, null, parameters, false, true);
         }
@@ -348,8 +348,8 @@ public static object CanResolve(this IResolutionRoot root, Type service, params
         /// <param name="service">The service to resolve.</param>
         /// <param name="name">The name of the binding.</param>
         /// <param name="parameters">The parameters to pass to the request.</param>
-        /// <returns>An instance of the service.</returns>
-        public static object CanResolve(this IResolutionRoot root, Type service, string name, params IParameter[] parameters)
+        /// <returns><c>True</c> if the request can be resolved; otherwise, <c>false</c>.</returns>
+        public static bool CanResolve(this IResolutionRoot root, Type service, string name, params IParameter[] parameters)
         {
             return CanResolve(root, service, b => b.Name == name, parameters, false, true);
         }
@@ -361,8 +361,8 @@ public static object CanResolve(this IResolutionRoot root, Type service, string
         /// <param name="service">The service to resolve.</param>
         /// <param name="constraint">The constraint to apply to the binding.</param>
         /// <param name="parameters">The parameters to pass to the request.</param>
-        /// <returns>An instance of the service.</returns>
-        public static object CanResolve(this IResolutionRoot root, Type service, Func<IBindingMetadata, bool> constraint, params IParameter[] parameters)
+        /// <returns><c>True</c> if the request can be resolved; otherwise, <c>false</c>.</returns>
+        public static bool CanResolve(this IResolutionRoot root, Type service, Func<IBindingMetadata, bool> constraint, params IParameter[] parameters)
         {
             return CanResolve(root, service, constraint, parameters, false, true);
         }