Add test to show bug fix works with second level cache.

Author: jlevitt

src/NHibernate.Test/NHSpecificTest/NH3634/CachedPerson.cs

@@ -0,0 +1,9 @@
+namespace NHibernate.Test.NHSpecificTest.NH3634
+{
+	class CachedPerson
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual Connection Connection { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3634/CachedPersonMapper.cs

@@ -0,0 +1,26 @@
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Conformist;
+
+namespace NHibernate.Test.NHSpecificTest.NH3634
+{
+	class CachedPersonMapper : ClassMapping<CachedPerson>
+	{
+		public CachedPersonMapper()
+		{
+			Id(p => p.Id, m => m.Generator(Generators.Identity));
+			Lazy(false);
+			Cache(m => m.Usage(CacheUsage.ReadWrite));
+			Table("cachedpeople");
+			Property(p => p.Name);
+			Component(
+				p => p.Connection,
+				m =>
+				{
+					m.Class<Connection>();
+					m.Property(c => c.ConnectionType, mapper => mapper.NotNullable(true)); 
+					m.Property(c => c.Address, mapper => mapper.NotNullable(false));
+					m.Property(c => c.PortName, mapper => mapper.NotNullable(false));
+				});
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3634/FixtureByCode.cs

@@ -11,6 +11,7 @@ protected override HbmMapping GetMappings()
 		{
 			var mapper = new ModelMapper();
 			mapper.AddMapping<PersonMapper>();
+			mapper.AddMapping<CachedPersonMapper>();
 
 			return mapper.CompileMappingForAllExplicitlyAddedEntities();
 		}
@@ -45,8 +46,21 @@ protected override void OnSetUp()
 					};
 				session.Save(e2);
 
+				var cachedConnection = new Connection
+				{
+					Address = "test.com",
+					ConnectionType = "http",
+				};
+				var cachedPerson = new CachedPerson
+				{
+					Name = "Cached",
+					Connection = cachedConnection
+				};
+				session.Save(cachedPerson);
+
 				session.Flush();
 				transaction.Commit();
+				session.Evict(typeof(CachedPerson));
 			}
 		}
 
@@ -131,6 +145,53 @@ public void QueryAgainstComponentWithANullPropertyUsingCriteria()
 			}
 		}
 
+		[Test]
+		public void CachedQueryAgainstComponentWithANullPropertyUsingCriteria()
+		{
+			var componentToCompare = new Connection
+				{
+					ConnectionType = "http",
+					Address = "test.com",
+					PortName = null
+				};
+
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				var cached = session.CreateCriteria<CachedPerson>()
+								   .Add(Restrictions.Eq("Connection", componentToCompare))
+								   .SetCacheable(true)
+								   .UniqueResult<CachedPerson>();
+
+				Assert.That(cached.Name, Is.EqualTo("Cached"));
+				Assert.That(cached.Connection.PortName, Is.Null);
+
+				using (var dbCommand = session.Connection.CreateCommand())
+				{
+					dbCommand.CommandText = "DELETE FROM cachedpeople";
+					tx.Enlist(dbCommand);
+					dbCommand.ExecuteNonQuery();
+				}
+
+				tx.Commit();
+			}
+
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				//Should retreive from cache since we deleted directly from database.
+				var cached = session.CreateCriteria<CachedPerson>()
+								   .Add(Restrictions.Eq("Connection", componentToCompare))
+								   .SetCacheable(true)
+								   .UniqueResult<CachedPerson>();
+
+				Assert.That(cached.Name, Is.EqualTo("Cached"));
+				Assert.That(cached.Connection.PortName, Is.Null);
+
+				tx.Commit();
+			}
+		}
+
 		[Test]
 		public void QueryOverANullComponentProperty()
 		{

src/NHibernate.Test/NHibernate.Test.csproj

@@ -809,6 +809,8 @@
     <Compile Include="NHSpecificTest\NH3604\Entity.cs" />
     <Compile Include="NHSpecificTest\NH3604\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3634\Person.cs" />
+    <Compile Include="NHSpecificTest\NH3634\CachedPerson.cs" />
+    <Compile Include="NHSpecificTest\NH3634\CachedPersonMapper.cs" />
     <Compile Include="NHSpecificTest\NH3634\PersonMapper.cs" />
     <Compile Include="NHSpecificTest\NH646\Domain.cs" />
     <Compile Include="NHSpecificTest\NH646\Fixture.cs" />