unitycontainer/container#149

Author: ENikS

src/Dependency/Injection/Parameters/OptionalGenericParameter.cs

@@ -1,5 +1,5 @@
 using System;
-using Unity.Policy;
+using Unity.Exceptions;
 using Unity.Resolution;
 
 namespace Unity.Injection
@@ -42,7 +42,11 @@ protected override ResolveDelegate<TContext> GetResolver<TContext>(Type type, st
             return (ref TContext context) =>
             {
                 try { return context.Resolve(type, name); }
-                catch {return null; }
+                catch (Exception ex) 
+                when (!(ex.InnerException is CircularDependencyException))
+                {
+                    return null;
+                }
             };
         }
 

src/Dependency/Injection/Parameters/OptionalParameter.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Reflection;
-using Unity.Policy;
+using Unity.Exceptions;
 using Unity.Resolution;
 
 namespace Unity.Injection
@@ -75,7 +75,11 @@ public ResolveDelegate<TContext> GetResolver<TContext>(Type type)
             return (ref TContext c) =>
             {
                 try { return c.Resolve(type, _name); }
-                catch { return null; }
+                catch (Exception ex) 
+                when (!(ex.InnerException is CircularDependencyException))
+                {
+                    return null;
+                }
             };
         }
 
@@ -102,14 +106,22 @@ public ResolveDelegate<TContext> GetResolver<TContext>(ParameterInfo info)
                 return (ref TContext c) =>
                 {
                     try { return c.Resolve(type, _name); }
-                    catch { return value; }
+                    catch (Exception ex) 
+                    when (!(ex.InnerException is CircularDependencyException))
+                    {
+                        return value;
+                    }
                 };
             }
 
             return (ref TContext c) =>
             {
                 try { return c.Resolve(ParameterType, _name); }
-                catch { return value; }
+                catch (Exception ex) 
+                when (!(ex.InnerException is CircularDependencyException))
+                {
+                    return value;
+                }
             };
         }
 

src/Exceptions/CircularDependencyException.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Unity.Exceptions
+{
+    internal class CircularDependencyException : Exception
+    {
+    }
+}