Fixed NH-3132

Author: Nicaog

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

@@ -80,5 +80,30 @@ public void Query_returns_correct_name()
                 Assert.AreEqual("First", product.Name);
             }
         }
+
+        [Test]
+        public void Correct_value_gets_saved()
+        {
+            using (var session = OpenSession())
+            {
+                Product product = session.CreateCriteria(typeof(Product))
+                    .Add(Restrictions.Eq("Name", "First"))
+                    .UniqueResult<Product>();
+
+                Assert.IsNotNull(product);
+                product.Name = "Changed";
+
+                session.Flush();
+                
+                session.Clear();
+
+                Product product1 = session.CreateCriteria(typeof(Product))
+                    .Add(Restrictions.Eq("Name", "Changed"))
+                    .UniqueResult<Product>();
+                
+                Assert.IsNotNull(product1);
+                Assert.AreEqual("Changed", product1.Name);
+            }
+        }
     }
 }

src/NHibernate/Properties/FieldAccessor.cs

@@ -3,6 +3,9 @@
 using System.Reflection;
 using System.Reflection.Emit;
 using NHibernate.Engine;
+using NHibernate.Intercept;
+using NHibernate.Proxy;
+using NHibernate.Proxy.DynamicProxy;
 using NHibernate.Util;
 
 namespace NHibernate.Properties
@@ -154,6 +157,22 @@ private string GetFieldName(string propertyName)
 			}
 		}
 
+		private static object GetTarget(object maybeProxy)
+		{
+			//wish there were an interface to unwrap with
+			var proxy = maybeProxy as IProxy;
+			if (proxy != null)
+			{
+				var fieldInterceptor = proxy.Interceptor as DefaultDynamicLazyFieldInterceptor;
+				if (fieldInterceptor != null)
+				{
+					return fieldInterceptor.TargetInstance;
+				}
+			}
+
+			return maybeProxy;
+		}
+
 		/// <summary>
 		/// An <see cref="IGetter"/> that uses a Field instead of the Property <c>get</c>.
 		/// </summary>
@@ -190,7 +209,7 @@ public object Get(object target)
 			{
 				try
 				{
-					return field.GetValue(target);
+					return field.GetValue(GetTarget(target));
 				}
 				catch (Exception e)
 				{
@@ -275,7 +294,7 @@ public void Set(object target, object value)
 			{
 				try
 				{
-					field.SetValue(target, value);
+					field.SetValue(GetTarget(target), value);
 				}
 				catch (ArgumentException ae)
 				{