From 82d5d43e759787bf4c78c2031dc2f50f1cc42c91 Mon Sep 17 00:00:00 2001 From: lahma Date: Fri, 24 Jul 2009 15:08:46 +0000 Subject: [PATCH] Fixing some unfortunate build problems... --- .../Data/NHibernate/LocalSessionFactoryObject.cs | 10 +--------- .../Spring.Data.NHibernate21.2008.csproj | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs index 6bb75d27..cdc6b309 100644 --- a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs +++ b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs @@ -253,7 +253,6 @@ namespace Spring.Data.NHibernate /// /// /// - /// public IInterceptor EntityInterceptor { set { this.entityInterceptor = value; } @@ -263,7 +262,6 @@ namespace Spring.Data.NHibernate /// Set a Hibernate NamingStrategy for the SessionFactory, determining the /// physical column and table names given the info in the mapping document. /// - /// public INamingStrategy NamingStrategy { set { this.namingStrategy = value; } @@ -313,10 +311,7 @@ namespace Spring.Data.NHibernate /// </props> /// </property> ///

- /// Note that appending a cache region name (with a comma separator) is only - /// supported on Hibernate 3.1, where this functionality is publically available. /// - /// public Properties EntityCacheStrategies { set { this.entityCacheStrategies = value; } @@ -335,9 +330,6 @@ namespace Spring.Data.NHibernate /// </props> /// </property> ///

- /// Note that appending a cache region name (with a comma separator) is only - /// supported on Hibernate 3.1, where this functionality is publically available. - /// /// public Properties CollectionCacheStrategies { @@ -997,7 +989,7 @@ namespace Spring.Data.NHibernate protected virtual DataAccessException ConvertAdoAccessException(ADOException ex) { - string sqlString = (ex.SqlString != null) ? ex.SqlString : string.Empty; + string sqlString = (ex.SqlString != null) ? ex.SqlString.ToString() : string.Empty; return AdoExceptionTranslator.Translate( "Hibernate operation: " + ex.Message, sqlString, ex.InnerException); diff --git a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj index bf01e713..87bc6616 100644 --- a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj +++ b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 9.0.21022 + 9.0.30729 2.0 {E57B4652-0231-49CB-B058-87E10EFE540D} Library @@ -20,7 +20,7 @@ prompt 4 Spring.Data.NHibernate21.xml - false + true