Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4346] trunk/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2009-05-19 00:07:03
|
Revision: 4346
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4346&view=rev
Author: fabiomaulo
Date: 2009-05-19 00:06:44 +0000 (Tue, 19 May 2009)
Log Message:
-----------
IObjectsFactory working
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Bytecode/AbstractBytecodeProvider.cs
trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs
trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/AuxiliaryDatabaseObjectFactory.cs
trunk/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs
trunk/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs
trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
trunk/nhibernate/src/NHibernate/Driver/ReflectionBasedDriver.cs
trunk/nhibernate/src/NHibernate/Exceptions/SQLExceptionConverterFactory.cs
trunk/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs
trunk/nhibernate/src/NHibernate/Impl/OracleClientCommandSet.cs
trunk/nhibernate/src/NHibernate/Impl/SessionFactoryImpl.cs
trunk/nhibernate/src/NHibernate/Impl/SqlClientCommandSet.cs
trunk/nhibernate/src/NHibernate/Mapping/Collection.cs
trunk/nhibernate/src/NHibernate/Properties/PropertyAccessorFactory.cs
trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaUpdate.cs
trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaValidator.cs
trunk/nhibernate/src/NHibernate/Transform/AliasToBeanResultTransformer.cs
trunk/nhibernate/src/NHibernate/Tuple/PocoInstantiator.cs
trunk/nhibernate/src/NHibernate/Type/CompositeCustomType.cs
trunk/nhibernate/src/NHibernate/Type/CustomCollectionType.cs
trunk/nhibernate/src/NHibernate/Type/CustomType.cs
trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs
Modified: trunk/nhibernate/src/NHibernate/Bytecode/AbstractBytecodeProvider.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Bytecode/AbstractBytecodeProvider.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Bytecode/AbstractBytecodeProvider.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -19,7 +19,7 @@
{
try
{
- return (IProxyFactoryFactory)Activator.CreateInstance(proxyFactoryFactory);
+ return (IProxyFactoryFactory) ObjectsFactory.CreateInstance(proxyFactoryFactory);
}
catch (Exception e)
{
Modified: trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -1717,7 +1717,7 @@
{
try
{
- listeners[i] = Activator.CreateInstance(ReflectHelper.ClassForName(listenerClasses[i]));
+ listeners[i] = Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(listenerClasses[i]));
}
catch (Exception e)
{
Modified: trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -185,7 +185,8 @@
try
{
settings.QueryCacheFactory =
- (IQueryCacheFactory) Activator.CreateInstance(ReflectHelper.ClassForName(queryCacheFactoryClassName));
+ (IQueryCacheFactory)
+ Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(queryCacheFactoryClassName));
}
catch (Exception cnfe)
{
@@ -275,7 +276,7 @@
log.Info("Batcher factory: " + tBatcher.AssemblyQualifiedName);
try
{
- return (IBatcherFactory) Activator.CreateInstance(tBatcher);
+ return (IBatcherFactory) Environment.BytecodeProvider.ObjectsFactory.CreateInstance(tBatcher);
}
catch (Exception cnfe)
{
@@ -294,7 +295,9 @@
log.Info("cache provider: " + cacheClassName);
try
{
- return (ICacheProvider) Activator.CreateInstance(ReflectHelper.ClassForName(cacheClassName));
+ return
+ (ICacheProvider)
+ Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(cacheClassName));
}
catch (Exception e)
{
@@ -330,7 +333,9 @@
log.Info("Query translator: " + className);
try
{
- return (IQueryTranslatorFactory) Activator.CreateInstance(ReflectHelper.ClassForName(className));
+ return
+ (IQueryTranslatorFactory)
+ Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(className));
}
catch (Exception cnfe)
{
@@ -346,7 +351,9 @@
try
{
- return (ITransactionFactory)Activator.CreateInstance(ReflectHelper.ClassForName(className));
+ return
+ (ITransactionFactory)
+ Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(className));
}
catch (Exception cnfe)
{
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/AuxiliaryDatabaseObjectFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/AuxiliaryDatabaseObjectFactory.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/AuxiliaryDatabaseObjectFactory.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -41,7 +41,8 @@
TypeNameParser.Parse(customTypeName, mappings.DefaultNamespace, mappings.DefaultAssembly).ToString();
System.Type customType = ReflectHelper.ClassForName(className);
- IAuxiliaryDatabaseObject customObject = (IAuxiliaryDatabaseObject)Activator.CreateInstance(customType);
+ IAuxiliaryDatabaseObject customObject =
+ (IAuxiliaryDatabaseObject) Environment.BytecodeProvider.ObjectsFactory.CreateInstance(customType);
foreach (string dialectName in databaseObjectSchema.FindDialectScopeNames())
{
Modified: trunk/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -104,7 +104,8 @@
{
try
{
- driver = (IDriver) Activator.CreateInstance(ReflectHelper.ClassForName(driverClass));
+ driver =
+ (IDriver) Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(driverClass));
driver.Configure(settings);
}
catch (Exception e)
Modified: trunk/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -28,7 +28,9 @@
try
{
log.Info("Initializing connection provider: " + providerClass);
- connections = (IConnectionProvider) Activator.CreateInstance(ReflectHelper.ClassForName(providerClass));
+ connections =
+ (IConnectionProvider)
+ Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(providerClass));
}
catch (Exception e)
{
Modified: trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -184,7 +184,7 @@
{
try
{
- return (Dialect) Activator.CreateInstance(ReflectHelper.ClassForName(dialectName));
+ return (Dialect) Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(dialectName));
}
catch (Exception e)
{
Modified: trunk/nhibernate/src/NHibernate/Driver/ReflectionBasedDriver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Driver/ReflectionBasedDriver.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Driver/ReflectionBasedDriver.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -1,4 +1,3 @@
-using System;
using System.Data;
using NHibernate.Util;
@@ -6,8 +5,8 @@
{
public abstract class ReflectionBasedDriver : DriverBase
{
- private System.Type connectionType;
- private System.Type commandType;
+ private readonly System.Type connectionType;
+ private readonly System.Type commandType;
/// <summary>
/// Initializes a new instance of <see cref="ReflectionBasedDriver" /> with
@@ -16,7 +15,7 @@
/// <param name="driverAssemblyName">Assembly to load the types from.</param>
/// <param name="connectionTypeName">Connection type name.</param>
/// <param name="commandTypeName">Command type name.</param>
- public ReflectionBasedDriver(string driverAssemblyName, string connectionTypeName, string commandTypeName)
+ protected ReflectionBasedDriver(string driverAssemblyName, string connectionTypeName, string commandTypeName)
{
// Try to get the types from an already loaded assembly
connectionType = ReflectHelper.TypeFromAssembly(connectionTypeName, driverAssemblyName, false);
@@ -36,12 +35,12 @@
public override IDbConnection CreateConnection()
{
- return (IDbConnection) Activator.CreateInstance(connectionType);
+ return (IDbConnection) Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(connectionType);
}
public override IDbCommand CreateCommand()
{
- return (IDbCommand) Activator.CreateInstance(commandType);
+ return (IDbCommand) Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(commandType);
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Exceptions/SQLExceptionConverterFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Exceptions/SQLExceptionConverterFactory.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Exceptions/SQLExceptionConverterFactory.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -106,7 +106,7 @@
}
// Otherwise, try to use the no-arg constructor
- return (ISQLExceptionConverter)Activator.CreateInstance(converterClass);
+ return (ISQLExceptionConverter) Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(converterClass);
}
catch (Exception t)
{
Modified: trunk/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -201,7 +201,7 @@
try
{
System.Type clazz = GetIdentifierGeneratorClass(strategy, dialect);
- var idgen = (IIdentifierGenerator) Activator.CreateInstance(clazz);
+ var idgen = (IIdentifierGenerator) Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(clazz);
var conf = idgen as IConfigurable;
if (conf != null)
{
Modified: trunk/nhibernate/src/NHibernate/Impl/OracleClientCommandSet.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/OracleClientCommandSet.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Impl/OracleClientCommandSet.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -1,4 +1,3 @@
-
using System;
using System.Data.OracleClient;
using System.Diagnostics;
@@ -6,22 +5,21 @@
namespace NHibernate.Impl
{
- internal class OracleClientCommandSet : DbCommandSet<OracleConnection, OracleCommand>
- {
- private static System.Type oracleCmdSetType;
+ internal class OracleClientCommandSet : DbCommandSet<OracleConnection, OracleCommand>
+ {
+ private static readonly System.Type oracleCmdSetType;
- static OracleClientCommandSet()
- {
- Assembly sysDataOracleClient = Assembly.Load("System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
- oracleCmdSetType = sysDataOracleClient.GetType("System.Data.OracleClient.OracleCommandSet");
- Debug.Assert(oracleCmdSetType != null, "Could not find OracleCommandSet!");
- }
+ static OracleClientCommandSet()
+ {
+ Assembly sysDataOracleClient =
+ Assembly.Load("System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
+ oracleCmdSetType = sysDataOracleClient.GetType("System.Data.OracleClient.OracleCommandSet");
+ Debug.Assert(oracleCmdSetType != null, "Could not find OracleCommandSet!");
+ }
- protected override object CreateInternalCommandSet()
- {
- return Activator.CreateInstance(oracleCmdSetType, true);
- }
-
- }
-}
-
+ protected override object CreateInternalCommandSet()
+ {
+ return Activator.CreateInstance(oracleCmdSetType, true);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Impl/SessionFactoryImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/SessionFactoryImpl.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Impl/SessionFactoryImpl.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -1143,7 +1143,8 @@
try
{
System.Type implClass = ReflectHelper.ClassForName(impl);
- return (ICurrentSessionContext) Activator.CreateInstance(implClass, new object[] {this});
+ return
+ (ICurrentSessionContext) Environment.BytecodeProvider.ObjectsFactory.CreateInstance(implClass, new object[] {this});
}
catch (Exception e)
{
Modified: trunk/nhibernate/src/NHibernate/Impl/SqlClientCommandSet.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/SqlClientCommandSet.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Impl/SqlClientCommandSet.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -1,34 +1,33 @@
-
using System;
using System.Data;
using System.Data.SqlClient;
-using System.Diagnostics;
using System.Reflection;
namespace NHibernate.Impl
{
- internal class SqlClientCommandSet : DbCommandSet<SqlConnection, System.Data.SqlClient.SqlCommand>
- {
- private static System.Type sqlCmdSetType;
+ internal class SqlClientCommandSet : DbCommandSet<SqlConnection, System.Data.SqlClient.SqlCommand>
+ {
+ private static readonly System.Type sqlCmdSetType;
- static SqlClientCommandSet()
- {
- Assembly sysData = typeof(IDbConnection).Assembly;
- sqlCmdSetType = sysData.GetType("System.Data.SqlClient.SqlCommandSet");
- }
+ static SqlClientCommandSet()
+ {
+ Assembly sysData = typeof (IDbConnection).Assembly;
+ sqlCmdSetType = sysData.GetType("System.Data.SqlClient.SqlCommandSet");
+ }
- protected override object CreateInternalCommandSet()
- {
- if (sqlCmdSetType == null)
- {
- throw new HibernateException("Could not find SqlCommandSet"+Environment.NewLine +
- "If you are running on Mono, batching support isn't implemented on Mono" + Environment.NewLine +
- "If you are running on Microsoft .NET, this probably means that internal details"+Environment.NewLine+
- "of the BCL that we rely on to allow this have changed, this is a bug. Please inform the developers");
- }
- return Activator.CreateInstance(sqlCmdSetType, true);
- }
-
- }
-}
-
+ protected override object CreateInternalCommandSet()
+ {
+ if (sqlCmdSetType == null)
+ {
+ throw new HibernateException("Could not find SqlCommandSet" + Environment.NewLine
+ + "If you are running on Mono, batching support isn't implemented on Mono"
+ + Environment.NewLine
+ + "If you are running on Microsoft .NET, this probably means that internal details"
+ + Environment.NewLine
+ +
+ "of the BCL that we rely on to allow this have changed, this is a bug. Please inform the developers");
+ }
+ return Activator.CreateInstance(sqlCmdSetType, true);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Mapping/Collection.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/Collection.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Mapping/Collection.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -156,7 +156,7 @@
{
try
{
- comparer = Activator.CreateInstance(ReflectHelper.ClassForName(ComparerClassName));
+ comparer = Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(ComparerClassName));
}
catch
{
Modified: trunk/nhibernate/src/NHibernate/Properties/PropertyAccessorFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Properties/PropertyAccessorFactory.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Properties/PropertyAccessorFactory.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -264,7 +264,7 @@
try
{
- IPropertyAccessor result = (IPropertyAccessor)Activator.CreateInstance(accessorClass);
+ var result = (IPropertyAccessor) Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(accessorClass);
accessors[accessorName] = result;
return result;
}
Modified: trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaUpdate.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaUpdate.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaUpdate.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -88,7 +88,8 @@
else if (args[i].StartsWith("--naming="))
{
cfg.SetNamingStrategy(
- (INamingStrategy) Activator.CreateInstance(ReflectHelper.ClassForName(args[i].Substring(9))));
+ (INamingStrategy)
+ Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(args[i].Substring(9))));
}
}
else
Modified: trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaValidator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaValidator.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaValidator.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -59,7 +59,8 @@
else if (args[i].StartsWith("--naming="))
{
cfg.SetNamingStrategy(
- (INamingStrategy) Activator.CreateInstance(ReflectHelper.ClassForName(args[i].Substring(9))));
+ (INamingStrategy)
+ Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(ReflectHelper.ClassForName(args[i].Substring(9))));
}
}
else
Modified: trunk/nhibernate/src/NHibernate/Transform/AliasToBeanResultTransformer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Transform/AliasToBeanResultTransformer.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Transform/AliasToBeanResultTransformer.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -79,7 +79,9 @@
}
// if resultClass is not a class but a value type, we need to use Activator.CreateInstance
- result = resultClass.IsClass ? constructor.Invoke(null) : Activator.CreateInstance(resultClass, true);
+ result = resultClass.IsClass
+ ? constructor.Invoke(null)
+ : Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(resultClass, true);
for (int i = 0; i < aliases.Length; i++)
{
Modified: trunk/nhibernate/src/NHibernate/Tuple/PocoInstantiator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Tuple/PocoInstantiator.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Tuple/PocoInstantiator.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -87,7 +87,7 @@
}
else if (mappedClass.IsValueType)
{
- return Activator.CreateInstance(mappedClass, true);
+ return Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(mappedClass, true);
}
else if (constructor == null)
{
Modified: trunk/nhibernate/src/NHibernate/Type/CompositeCustomType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/CompositeCustomType.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Type/CompositeCustomType.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -25,7 +25,7 @@
try
{
- userType = (ICompositeUserType) Activator.CreateInstance(userTypeClass);
+ userType = (ICompositeUserType) Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(userTypeClass);
}
catch (MethodAccessException mae)
{
Modified: trunk/nhibernate/src/NHibernate/Type/CustomCollectionType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/CustomCollectionType.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Type/CustomCollectionType.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -28,7 +28,7 @@
try
{
- userType = (IUserCollectionType) Activator.CreateInstance(userTypeClass);
+ userType = (IUserCollectionType) Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(userTypeClass);
}
catch (InstantiationException ie)
{
Modified: trunk/nhibernate/src/NHibernate/Type/CustomType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/CustomType.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Type/CustomType.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -34,7 +34,7 @@
try
{
- userType = (IUserType) Activator.CreateInstance(userTypeClass);
+ userType = (IUserType) Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(userTypeClass);
}
catch (ArgumentNullException ane)
{
Modified: trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs 2009-05-18 23:00:41 UTC (rev 4345)
+++ trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs 2009-05-19 00:06:44 UTC (rev 4346)
@@ -399,7 +399,7 @@
{
try
{
- type = (IType)Activator.CreateInstance(typeClass);
+ type = (IType) Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(typeClass);
}
catch (Exception e)
{
@@ -811,9 +811,10 @@
string propertyRef,
params System.Type[] typeArguments)
{
- return (CollectionType)Activator.CreateInstance(
- genericCollectionType.MakeGenericType(typeArguments),
- role, propertyRef);
+ return
+ (CollectionType)
+ Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(
+ genericCollectionType.MakeGenericType(typeArguments), role, propertyRef);
}
private static CollectionType CreateSortedCollectionType(
@@ -823,9 +824,10 @@
object comparer,
params System.Type[] typeArguments)
{
- return (CollectionType)Activator.CreateInstance(
- genericCollectionType.MakeGenericType(typeArguments),
- role, propertyRef, comparer);
+ return
+ (CollectionType)
+ Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(
+ genericCollectionType.MakeGenericType(typeArguments), role, propertyRef, comparer);
}
private static CollectionType CreateOrderedCollectionType(System.Type genericCollectionType,
@@ -834,7 +836,9 @@
params System.Type[] typeArguments)
{
return
- (CollectionType)Activator.CreateInstance(genericCollectionType.MakeGenericType(typeArguments), role, propertyRef);
+ (CollectionType)
+ Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(
+ genericCollectionType.MakeGenericType(typeArguments), role, propertyRef);
}
/// <summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
