NH3500 - Unwrap TIE errors for classes with lazy properties

Author: Mark Perry

src/NHibernate.Test/NHSpecificTest/NH3500/Fixture.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NHibernate.Intercept;
+using NHibernate.Proxy;
+using NHibernate.Test.DynamicProxyTests;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3500
+{
+    [Serializable]
+    public class MyClass
+    {
+        public virtual int Id { get; set; }
+
+        public virtual void ThrowError()
+        {
+            throw new Exception("test");
+        }
+    }
+
+    [TestFixture]
+    public class Fixture
+    {
+        [Test]
+        public void DefaultDynamicLazyFieldInterceptorUnWrapsTIEExceptions()
+        {
+            var pf = new DefaultProxyFactory();
+            var propertyInfo = typeof(MyClass).GetProperty("Id");
+            pf.PostInstantiate("MyClass", typeof(MyClass), new HashSet<System.Type>(), propertyInfo.GetGetMethod(), propertyInfo.GetSetMethod(), null);
+            var myClassProxied = (MyClass)pf.GetFieldInterceptionProxy(new MyClass());
+            Assert.Throws<Exception>(() => myClassProxied.ThrowError(), "test");
+        }
+    }
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -731,6 +731,7 @@
     <Compile Include="NHSpecificTest\NH2931\Models.cs" />
     <Compile Include="NHSpecificTest\NH3046\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3046\Model.cs" />
+    <Compile Include="NHSpecificTest\NH3500\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3518\ClassWithXmlMember.cs" />
     <Compile Include="NHSpecificTest\NH3518\XmlColumnTest.cs" />
     <Compile Include="NHSpecificTest\NH3609\MappingEntity.cs" />
@@ -3754,7 +3755,6 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/NHibernate/Intercept/DefaultDynamicLazyFieldInterceptor.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using NHibernate.Proxy.DynamicProxy;
 using NHibernate.Util;
 
@@ -50,7 +51,16 @@ public object Intercept(InvocationInfo info)
 				}
 			}
 
-			return info.InvokeMethodOnTarget();
+            object returnValue;
+            try
+            {
+                returnValue = info.InvokeMethodOnTarget();
+            }
+            catch (TargetInvocationException ex)
+            {
+                throw ReflectHelper.UnwrapTargetInvocationException(ex);
+            }
+            return returnValue;
 		}
 	}
 }