fixup! Replace IObjectsFactory with IServiceProvider interface

fredericDelaporte · fredericDelaporte · commit 79b5c5a36fb9 · 2018-08-01T13:26:03.000+02:00
Fix regression: must use GetService instead of GetInstance for
ICurrentSessionContext, since it is optional and GetInstance does not
support it.
diff --git a/src/NHibernate/Impl/SessionFactoryImpl.cs b/src/NHibernate/Impl/SessionFactoryImpl.cs
@@ -1290,7 +1290,7 @@ private ICurrentSessionContext BuildCurrentSessionContext()
 				}
 				else
 				{
-					context = (ICurrentSessionContext) Environment.ServiceProvider.GetInstance(
+					context = (ICurrentSessionContext) Environment.ServiceProvider.GetService(
 						implClass ?? typeof(ICurrentSessionContext));
 				}
 				if (context is ISessionFactoryAwareCurrentSessionContext sessionFactoryAwareContext)

Original file line number	Diff line number	Diff line change
`@@ -1290,7 +1290,7 @@ private ICurrentSessionContext BuildCurrentSessionContext()`
`1290`	`1290`	`}`
`1291`	`1291`	`else`
`1292`	`1292`	`{`
`1293`		`- context = (ICurrentSessionContext) Environment.ServiceProvider.GetInstance(`
	`1293`	`+ context = (ICurrentSessionContext) Environment.ServiceProvider.GetService(`
`1294`	`1294`	`implClass ?? typeof(ICurrentSessionContext));`
`1295`	`1295`	`}`
`1296`	`1296`	`if (context is ISessionFactoryAwareCurrentSessionContext sessionFactoryAwareContext)`