From: <fab...@us...> - 2009-06-14 19:51:45
|
Revision: 4468 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4468&view=rev Author: fabiomaulo Date: 2009-06-14 19:51:40 +0000 (Sun, 14 Jun 2009) Log Message: ----------- Minor Modified Paths: -------------- trunk/nhibernate/src/NHibernate/Mapping/Column.cs trunk/nhibernate/src/NHibernate/SqlTypes/SqlTypeFactory.cs Modified: trunk/nhibernate/src/NHibernate/Mapping/Column.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Mapping/Column.cs 2009-06-14 18:25:16 UTC (rev 4467) +++ trunk/nhibernate/src/NHibernate/Mapping/Column.cs 2009-06-14 19:51:40 UTC (rev 4468) @@ -389,20 +389,20 @@ public SqlType GetSqlTypeCode(IMapping mapping) { - IType _type = Value.Type; + IType type = Value.Type; try { - SqlType _sqlTypeCode = _type.SqlTypes(mapping)[TypeIndex]; - if (SqlTypeCode != null && SqlTypeCode != _sqlTypeCode) + SqlType sqltc = type.SqlTypes(mapping)[TypeIndex]; + if (SqlTypeCode != null && SqlTypeCode != sqltc) { - throw new MappingException(string.Format("SQLType code's does not match. mapped as {0} but is {1}", sqlTypeCode, SqlTypeCode)); + throw new MappingException(string.Format("SQLType code's does not match. mapped as {0} but is {1}", sqltc, SqlTypeCode)); } - return _sqlTypeCode; + return sqltc; } catch (Exception e) { throw new MappingException(string.Format("Could not determine type for column {0} of type {1}: {2}", - name, _type.GetType().FullName, e.GetType().FullName), e); + name, type.GetType().FullName, e.GetType().FullName), e); } } Modified: trunk/nhibernate/src/NHibernate/SqlTypes/SqlTypeFactory.cs =================================================================== --- trunk/nhibernate/src/NHibernate/SqlTypes/SqlTypeFactory.cs 2009-06-14 18:25:16 UTC (rev 4467) +++ trunk/nhibernate/src/NHibernate/SqlTypes/SqlTypeFactory.cs 2009-06-14 19:51:40 UTC (rev 4468) @@ -1,6 +1,7 @@ using System; using System.Data; using System.Collections.Generic; +using System.Runtime.CompilerServices; using NHibernate.Util; namespace NHibernate.SqlTypes @@ -84,6 +85,7 @@ return GetTypeWithLen<StringSqlType>(length, l => new StringSqlType(l)); } + [MethodImpl(MethodImplOptions.Synchronized)] public static SqlType GetSqlType(DbType dbType, byte precision, byte scale) { return GetTypeWithPrecision(dbType, precision, scale); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |