From a47bc46695e70dc2daa52da82f2fd4e25babb41f Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Mon, 15 Nov 2010 15:53:59 -0800
Subject: [PATCH] Medium Trust: conditionally disabling reflection-optimizer.

--HG--
branch : dev
---
 src/Orchard.Web/Web.config               | 6 ------
 src/Orchard/Data/SessionFactoryHolder.cs | 8 +++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config
index 6489faac1..59051d832 100644
--- a/src/Orchard.Web/Web.config
+++ b/src/Orchard.Web/Web.config
@@ -13,14 +13,8 @@
       <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor" requirePermission="false" />
       <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor" requirePermission="false" />
     </sectionGroup>
-
-    <section name="hibernate-configuration" requirePermission="false" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" />
   </configSections>
 
-  <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
-    <reflection-optimizer use="false"/>
-  </hibernate-configuration>
-
   <system.diagnostics configSource="Config\Diagnostics.config"/>
 
   <system.web.webPages.razor>
diff --git a/src/Orchard/Data/SessionFactoryHolder.cs b/src/Orchard/Data/SessionFactoryHolder.cs
index 18c1dc73f..8a574d53a 100644
--- a/src/Orchard/Data/SessionFactoryHolder.cs
+++ b/src/Orchard/Data/SessionFactoryHolder.cs
@@ -1,4 +1,7 @@
 using System;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Soap;
+using System.Xml.Serialization;
 using NHibernate;
 using NHibernate.Cfg;
 using Orchard.Data;
@@ -66,7 +69,10 @@ namespace Orchard.Data {
         private ISessionFactory BuildSessionFactory() {
             Logger.Debug("Building session factory");
 
-            var config = GetConfiguration();
+            if (!(AppDomain.CurrentDomain.IsHomogenous && AppDomain.CurrentDomain.IsFullyTrusted))
+                NHibernate.Cfg.Environment.UseReflectionOptimizer = false;
+
+            Configuration config = GetConfiguration();
             return config.BuildSessionFactory();
         }