Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

System.Diagnostics.Trace.WriteLine on line 97 of SimpleDelegatingSessionFactory.cs opens a database connection but never closes it.

Browse Source 
Replaced ((ISessionFactoryImplementor)factory).ConnectionProvider.GetConnection().ConnectionString
With local variable: connectionString

An example of the unclosed connection can be found at: http://forum.springframework.net/showthread.php?9478-DelegatingLocalSessionFactoryObject-database-connection-leak
This commit is contained in:
jperrin
2011-10-06 11:14:21 -05:00
parent bac9809d79
commit fc3cb1642b
1 changed files with 105 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
src/Spring/Spring.Data.NHibernate21/Data/NHibernate/SimpleDelegatingSessionFactory.cs
View File

@@ -1,105 +1,105 @@
using System.Collections;
using NHibernate;
using NHibernate.Cfg;
using NhCfg = NHibernate.Cfg;
using Spring.Collections;
using Spring.Threading;
using Spring.Data.Common;
using Spring.Context.Support;
using NHibernate.Engine;
using System;
namespace Spring.Data.NHibernate
{
/// <summary>
/// SimpleDelegatingSessionFactory class
/// </summary>
public class SimpleDelegatingSessionFactory : DelegatingSessionFactory
{
/// <summary>
/// Connection string config element name
/// </summary>
public const string CONNECTION_STRING = "SimpleDelegatingSessionFactory.ConnectionString";
private Configuration _configuration;
private string _defaultConnectionString;
private object _monitor = new object();
private IDictionary _targetSessionFactories = new SynchronizedHashtable();
/// <summary>
/// public Constructor
/// </summary>
/// <param name="defaultConfiguration"></param>
public SimpleDelegatingSessionFactory(Configuration defaultConfiguration)
{
if (defaultConfiguration == null)
{
throw new ArgumentException("Configuration cannot be null", "defaultConfiguration");
}
_configuration = defaultConfiguration;
if (!_configuration.Properties.ContainsKey(NhCfg.Environment.ConnectionString))
{
throw new ArgumentException("Must specify connection string");
}
_defaultConnectionString = _configuration.Properties[NhCfg.Environment.ConnectionString] as string;
if (_defaultConnectionString == null)
{
throw new ArgumentException("Connection string property must be of type string, not " +
_configuration.Properties[NhCfg.Environment.ConnectionString].GetType().FullName);
}
}
/// <summary>
/// TargetSessionFactory
/// </summary>
public override ISessionFactory TargetSessionFactory
{
get
{
string connectionString = LogicalThreadContext.GetData(CONNECTION_STRING) as string;
System.Diagnostics.Trace.WriteLine(String.Format("{0} = {1}", System.Threading.Thread.CurrentThread.GetHashCode(), connectionString));
if (connectionString == null)
{
connectionString = _defaultConnectionString;
}
lock (_monitor)
{
if (!_targetSessionFactories.Contains(connectionString))
{
System.Diagnostics.Trace.WriteLine(System.Threading.Thread.CurrentThread.GetHashCode().ToString() + " = (created) ");
_configuration.Properties[NhCfg.Environment.ConnectionString] = connectionString;
ISessionFactory sessionFactory = _configuration.BuildSessionFactory();
LocalSessionFactoryObject.DbProviderWrapper dbProviderWrapper = ((ISessionFactoryImplementor)sessionFactory).ConnectionProvider as LocalSessionFactoryObject.DbProviderWrapper;
if (dbProviderWrapper != null)
{
dbProviderWrapper.DbProvider = (IDbProvider)ContextRegistry.GetContext().GetObject("DbProvider");
}
_targetSessionFactories[connectionString] = sessionFactory;
}
else
System.Diagnostics.Trace.WriteLine(System.Threading.Thread.CurrentThread.GetHashCode().ToString() + " = (cached) ");
ISessionFactory factory = _targetSessionFactories[connectionString] as ISessionFactory;
System.Diagnostics.Trace.WriteLine(String.Format("{0} = {1}", System.Threading.Thread.CurrentThread.GetHashCode(), ((ISessionFactoryImplementor)factory).ConnectionProvider.GetConnection().ConnectionString));
return factory;
}
}
}
}
}
using System.Collections;
using NHibernate;
using NHibernate.Cfg;
using NhCfg = NHibernate.Cfg;
using Spring.Collections;
using Spring.Threading;
using Spring.Data.Common;
using Spring.Context.Support;
using NHibernate.Engine;
using System;
namespace Spring.Data.NHibernate
{
/// <summary>
/// SimpleDelegatingSessionFactory class
/// </summary>
public class SimpleDelegatingSessionFactory : DelegatingSessionFactory
{
/// <summary>
/// Connection string config element name
/// </summary>
public const string CONNECTION_STRING = "SimpleDelegatingSessionFactory.ConnectionString";
private Configuration _configuration;
private string _defaultConnectionString;
private object _monitor = new object();
private IDictionary _targetSessionFactories = new SynchronizedHashtable();
/// <summary>
/// public Constructor
/// </summary>
/// <param name="defaultConfiguration"></param>
public SimpleDelegatingSessionFactory(Configuration defaultConfiguration)
{
if (defaultConfiguration == null)
{
throw new ArgumentException("Configuration cannot be null", "defaultConfiguration");
}
_configuration = defaultConfiguration;
if (!_configuration.Properties.ContainsKey(NhCfg.Environment.ConnectionString))
{
throw new ArgumentException("Must specify connection string");
}
_defaultConnectionString = _configuration.Properties[NhCfg.Environment.ConnectionString] as string;
if (_defaultConnectionString == null)
{
throw new ArgumentException("Connection string property must be of type string, not " +
_configuration.Properties[NhCfg.Environment.ConnectionString].GetType().FullName);
}
}
/// <summary>
/// TargetSessionFactory
/// </summary>
public override ISessionFactory TargetSessionFactory
{
get
{
string connectionString = LogicalThreadContext.GetData(CONNECTION_STRING) as string;
System.Diagnostics.Trace.WriteLine(String.Format("{0} = {1}", System.Threading.Thread.CurrentThread.GetHashCode(), connectionString));
if (connectionString == null)
{
connectionString = _defaultConnectionString;
}
lock (_monitor)
{
if (!_targetSessionFactories.Contains(connectionString))
{
System.Diagnostics.Trace.WriteLine(System.Threading.Thread.CurrentThread.GetHashCode().ToString() + " = (created) ");
_configuration.Properties[NhCfg.Environment.ConnectionString] = connectionString;
ISessionFactory sessionFactory = _configuration.BuildSessionFactory();
LocalSessionFactoryObject.DbProviderWrapper dbProviderWrapper = ((ISessionFactoryImplementor)sessionFactory).ConnectionProvider as LocalSessionFactoryObject.DbProviderWrapper;
if (dbProviderWrapper != null)
{
dbProviderWrapper.DbProvider = (IDbProvider)ContextRegistry.GetContext().GetObject("DbProvider");
}
_targetSessionFactories[connectionString] = sessionFactory;
}
else
System.Diagnostics.Trace.WriteLine(System.Threading.Thread.CurrentThread.GetHashCode().ToString() + " = (cached) ");
ISessionFactory factory = _targetSessionFactories[connectionString] as ISessionFactory;
System.Diagnostics.Trace.WriteLine(String.Format("{0} = {1}", System.Threading.Thread.CurrentThread.GetHashCode(), connectionString));
return factory;
}
}
}
}
}