Merge branch 'master' into master

Author: hazzik

lgpl.txt renamed to LICENSE.txt

@@ -46,9 +46,13 @@ can be found [here][C2].
 Licenses
 --------
 
-This software is distributed under the terms of the Free Software Foundation [Lesser GNU Public License (LGPL), version 2.1][D1] (see lgpl.txt).
+- This software is distributed under the terms of the Free Software Foundation [Lesser GNU Public License (LGPL), version 2.1][D1] (see [LICENSE.txt][D2]).
+- The documentation for this software is distributed under the terms of the Free Software Foundation [GNU Free Documentation License (GNU FDL), version 1.1][D3] (see [doc/LICENSE.txt][D4]).
 
 [D1]: http://www.gnu.org/licenses/lgpl-2.1-standalone.html
+[D2]: LICENSE.txt
+[D3]: http://www.gnu.org/licenses/old-licenses/fdl-1.1-standalone.html
+[D4]: doc/LICENSE.txt
 
 Credits
 -------

README.md

@@ -78,8 +78,6 @@
 		<foreach item="String" delim=" " property="framework" in="${supported.frameworks}">
 			<call target="set-${framework}-framework-configuration" />
 			<call target="build" />
-			<!-- Copy and rename the license -->
-			<copy file="lgpl.txt" tofile="${bin.dir}/NHibernate.license.txt"  />
 		</foreach>
 
 		<!-- Reset the current framework to the saved value -->
@@ -124,10 +122,9 @@
 				<include name="build-common/**" />
 
 				<include name="*.build" />
-				<include name="gfdl.txt" />
-				<include name="lgpl.txt" />
+				<include name="LICENSE.txt" />
 				<include name="releasenotes.txt" />
-				<include name="readme.html" />
+				<include name="README.md" />
 
 				<!-- exclude ReSharper stuff -->
 				<exclude name="**/_ReSharper*/**" />
@@ -170,8 +167,7 @@
 		<property name="bin-pack.tests" value="${bin-pack.tmpdir}/Tests" />
 
 		<copy file="releasenotes.txt" todir="${bin-pack.tmpdir}"/>
-		<copy file="lgpl.txt" todir="${bin-pack.tmpdir}/NHibernate.license.txt"/>
-		<copy file="gfdl.txt" todir="${bin-pack.tmpdir}"/>
+		<copy file="LICENSE.txt" todir="${bin-pack.tmpdir}"/>
 		<copy file="HowInstall.txt" todir="${bin-pack.tmpdir}"/>
 
 		<exec program="CScript.exe"

default.build

@@ -26,6 +26,7 @@
 
 	<target name="manual" depends="init">
 		<property name="lang" value="en" />
+		<copy file="LICENSE.txt" todir="${doc.out.dir}"/>
 		<nant target="build" buildfile="reference/reference.build">
 			<properties>
 				<property name="lang" value="${lang}" />

gfdl.txt renamed to doc/LICENSE.txt

@@ -35,9 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NAnt Build", "NAnt Build",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Information", "Information", "{1631B0BA-59AC-4F0D-B300-3F64CC7579C9}"
 	ProjectSection(SolutionItems) = preProject
-		..\gfdl.txt = ..\gfdl.txt
-		..\lgpl.txt = ..\lgpl.txt
-		..\readme.html = ..\readme.html
+		..\LICENSE.txt = ..\LICENSE.txt
+		..\README.md = ..\README.md
 		..\releasenotes.txt = ..\releasenotes.txt
 		..\sample build commands.txt = ..\sample build commands.txt
 		..\ShowBuildMenu.bat = ..\ShowBuildMenu.bat

doc/documentation.build

@@ -0,0 +1,79 @@
+using System.Collections;
+using System.Threading;
+using NHibernate.Cfg;
+using NHibernate.Context;
+using NHibernate.Engine;
+using NUnit.Framework;
+
+namespace NHibernate.Test.ConnectionTest
+{
+	[TestFixture]
+	public class MapBasedSessionContextFixture : ConnectionManagementTestCase
+	{
+		protected override ISession GetSessionUnderTest()
+		{
+			ISession session = OpenSession();
+			session.BeginTransaction();
+			return session;
+		}
+
+		protected override void Configure(Configuration configuration)
+		{
+			base.Configure(cfg);
+			cfg.SetProperty(Environment.CurrentSessionContextClass, typeof(TestableMapBasedSessionContext).AssemblyQualifiedName);
+		}
+
+		protected override void OnSetUp()
+		{
+			TestableMapBasedSessionContext._map = null;
+		}
+
+		[Test]
+		public void MapContextThreadSafety()
+		{
+			using (var factory1 = cfg.BuildSessionFactory())
+			using (var session1 = factory1.OpenSession())
+			using (var factory2 = cfg.BuildSessionFactory())
+			using (var session2 = factory2.OpenSession())
+			{
+				var thread1 = new Thread(() =>
+				{
+					CurrentSessionContext.Bind(session1);
+				});
+
+				var thread2 = new Thread(() =>
+				{
+					CurrentSessionContext.Bind(session2);
+				});
+
+				thread1.Start();
+				thread2.Start();
+				thread1.Join();
+				thread2.Join();
+
+				Assert.IsTrue(CurrentSessionContext.HasBind(factory1), $"No session bound to \"{nameof(factory1)}\" factory.");
+				Assert.IsTrue(CurrentSessionContext.HasBind(factory2), $"No session bound to \"{nameof(factory2)}\" factory.");
+			}
+		}
+	}
+
+	public class TestableMapBasedSessionContext : MapBasedSessionContext
+	{
+		public TestableMapBasedSessionContext(ISessionFactoryImplementor factory) : base(factory) { }
+
+		// Context is the app with such implementation. Just for the test case.
+		internal static IDictionary _map;
+
+		protected override IDictionary GetMap()
+		{
+			return _map;
+		}
+
+		protected override void SetMap(IDictionary value)
+		{
+			// Give a fair chance to have a concurrency bug if base implementation is not thread safe.
+			Thread.Sleep(100);
+			_map = value;
+		}
+	}
+}

src/NHibernate.Everything.sln

@@ -128,7 +128,9 @@ private void AssertObjectsAreEqual(object expected, object actual, string name)
 
 			if ((expectedType.IsValueType)
 				|| (expected is System.Type)
-				|| (expected is string))
+				|| (expected is string)
+				|| (expected is FieldInfo)
+				|| (expected is PropertyInfo))
 			{
 				Assert.AreEqual(expected, actual, fieldPath);
 				_fieldPath.Pop();

src/NHibernate.Test/ConnectionTest/MapBasedSessionContextFixture.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Linq.ByMethod
@@ -14,7 +15,10 @@ public void EmptySumDecimal()
 				{
 					db.OrderLines.Where(ol => false).Sum(ol => ol.Discount);
 				},
-				Throws.InstanceOf<HibernateException>());
+				// Before NH-3850
+				Throws.InstanceOf<HibernateException>()
+				// After NH-3850
+				.Or.InstanceOf<InvalidOperationException>());
 		}
 
 		[Test]

src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs

@@ -32,10 +32,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 			{
 				return false;
 			}
-			catch (Exception)
-			{
-				Assert.Fail("Probably a bug in the test case.");
-			}
 
 			return true;
 		}

src/NHibernate.Test/Linq/ByMethod/SumTests.cs

@@ -9,4 +9,19 @@ public class Invoice
 
 		protected virtual DateTime issued { get; set; }
 	}
+
+	public class InvoiceWithAddress : Invoice
+	{
+		public virtual Address BillingAddress { get; set; }
+	}
+
+	public struct Address
+	{
+		public string Line { get; set; }
+		public string line { get; set; }
+		public string Line2 { get; set; }
+		public string City { get; set; }
+		public string ZipCode { get; set; }
+		public string Country { get; set; }
+	}
 }

src/NHibernate.Test/NHSpecificTest/Dates/FixtureBase.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1904
+{
+	[TestFixture]
+	public class StructFixture : BugTestCase
+	{
+		protected override IList Mappings =>
+			new string[]
+			{
+				"NHSpecificTest." + BugNumber + ".StructMappings.hbm.xml"
+			};
+
+		[Test]
+		public void ExecuteQuery()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				var invoice = new InvoiceWithAddress
+				{
+					Issued = DateTime.Now,
+					BillingAddress = new Address { Line = "84 rue du 22 septembre", City = "Courbevoie", ZipCode = "92400", Country = "France" }
+				};
+				session.Save(invoice);
+				transaction.Commit();
+			}
+
+			using (ISession session = OpenSession())
+			{
+				var invoices = session.CreateCriteria<Invoice>().List<Invoice>();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
+			using (ISession session = OpenSession())
+			{
+				session.CreateQuery("delete from InvoiceWithAddress").ExecuteUpdate();
+				session.Flush();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH1904/Model.cs

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+    assembly="NHibernate.Test"
+    namespace="NHibernate.Test.NHSpecificTest.NH1904">
+
+  <class name="InvoiceWithAddress">
+    <id name="ID" type="Int32">
+      <generator class="hilo" />
+    </id>
+
+    <property name="Issued" type="DateTime" />
+
+    <component name="BillingAddress">
+      <property name="Line"/>
+      <property name="Line2"/>
+      <property name="City"/>
+      <property name="ZipCode"/>
+      <property name="Country"/>
+    </component>
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH1904/StructFixture.cs

@@ -10,11 +10,9 @@ public class SampleTest : BugTestCase
 	{
 		protected override void OnSetUp()
 		{
-			base.OnSetUp();
-
 			if (0 == ExecuteStatement("INSERT INTO DomainClass (Id, Label) VALUES (1, 'TEST record');"))
 			{
-				throw new ApplicationException("Insertion of test record failed.");
+				Assert.Fail("Insertion of test record failed.");
 			}
 		}
 
@@ -26,7 +24,7 @@ protected override void OnTearDown()
 		}
 
 		[Test]
-		[Ignore("It is valid to be delete immutable entities")]
+		[Ignore("It is valid to delete immutable entities")]
 		public void AttemptToDeleteImmutableObjectShouldThrow()
 		{
 			using (ISession session = OpenSession())

src/NHibernate.Test/NHSpecificTest/NH1904/StructMappings.hbm.xml

@@ -0,0 +1,49 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH3850
+{
+	public abstract class DomainClassBase
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual int? Integer { get; set; }
+		public virtual long? Long { get; set; }
+		public virtual decimal? Decimal { get; set; }
+		public virtual double? Double { get; set; }
+		public virtual DateTime? DateTime { get; set; }
+		public virtual DateTimeOffset? DateTimeOffset { get; set; }
+		public virtual decimal NonNullableDecimal { get; set; }
+	}
+
+	public class DomainClassAExtendingB : DomainClassBExtendedByA
+	{
+	}
+
+	public class DomainClassBExtendedByA : DomainClassBase
+	{
+	}
+
+	public class DomainClassCExtendedByD : DomainClassBase
+	{
+	}
+
+	public class DomainClassDExtendingC : DomainClassCExtendedByD
+	{
+	}
+
+	public class DomainClassE : DomainClassBase
+	{
+	}
+
+	public class DomainClassF : DomainClassBase
+	{
+	}
+
+	public class DomainClassGExtendedByH : DomainClassBase
+	{
+	}
+
+	public class DomainClassHExtendingG : DomainClassGExtendedByH
+	{
+	}
+}