Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[53640] NETProvider/trunk/NETProvider/source/ FirebirdSql/Data
|
From: <cin...@us...> - 2011-11-20 09:45:08
|
Revision: 53640
http://firebird.svn.sourceforge.net/firebird/?rev=53640&view=rev
Author: cincura_net
Date: 2011-11-20 09:45:00 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Fixed deadlocks and NullRefs on dispose (DNET-316).
Modified Paths:
--------------
NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/GdsTransaction.cs
NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbConnectionInternal.cs
Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/GdsTransaction.cs
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/GdsTransaction.cs 2011-11-18 03:20:43 UTC (rev 53639)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/GdsTransaction.cs 2011-11-20 09:45:00 UTC (rev 53640)
@@ -38,6 +38,7 @@
private bool disposed;
private GdsDatabase database;
private TransactionState state;
+ private object stateSyncRoot;
#endregion
@@ -57,15 +58,21 @@
#region \xB7 Constructors \xB7
+ private GdsTransaction()
+ {
+ stateSyncRoot = new object();
+ }
+
public GdsTransaction(IDatabase db)
+ : this()
{
if (!(db is GdsDatabase))
{
throw new ArgumentException("Specified argument is not of GdsDatabase type.");
}
- this.database = (GdsDatabase)db;
- this.state = TransactionState.NoTransaction;
+ this.database = (GdsDatabase)db;
+ this.state = TransactionState.NoTransaction;
GC.SuppressFinalize(this);
}
@@ -91,7 +98,7 @@
private void Dispose(bool disposing)
{
- lock (this)
+ lock (stateSyncRoot)
{
if (!this.disposed)
{
@@ -125,26 +132,30 @@
public void BeginTransaction(TransactionParameterBuffer tpb)
{
- if (this.state != TransactionState.NoTransaction)
+ lock (stateSyncRoot)
{
- throw new IscException(IscCodes.isc_arg_gds, IscCodes.isc_tra_state, this.handle, "no valid");
- }
+ if (this.state != TransactionState.NoTransaction)
+ {
+ throw GetNoValidTransactionException();
+ }
- lock (this.database.SyncObject)
- {
try
{
- this.database.Write(IscCodes.op_transaction);
- this.database.Write(this.database.Handle);
- this.database.WriteBuffer(tpb.ToArray());
- this.database.Flush();
+ GenericResponse response;
+ lock (this.database.SyncObject)
+ {
+ this.database.Write(IscCodes.op_transaction);
+ this.database.Write(this.database.Handle);
+ this.database.WriteBuffer(tpb.ToArray());
+ this.database.Flush();
- GenericResponse response = this.database.ReadGenericResponse();
+ response = this.database.ReadGenericResponse();
- this.handle = response.ObjectHandle;
- this.state = TransactionState.Active;
+ this.database.TransactionCount++;
+ }
- this.database.TransactionCount++;
+ this.handle = response.ObjectHandle;
+ this.state = TransactionState.Active;
}
catch (IOException)
{
@@ -155,19 +166,22 @@
public void Commit()
{
- this.CheckTransactionState();
+ lock (stateSyncRoot)
+ {
+ this.CheckTransactionState();
- lock (this.database.SyncObject)
- {
try
{
- this.database.Write(IscCodes.op_commit);
- this.database.Write(this.handle);
- this.database.Flush();
+ lock (this.database.SyncObject)
+ {
+ this.database.Write(IscCodes.op_commit);
+ this.database.Write(this.handle);
+ this.database.Flush();
- this.database.ReadResponse();
+ this.database.ReadResponse();
- this.database.TransactionCount--;
+ this.database.TransactionCount--;
+ }
if (this.Update != null)
{
@@ -185,19 +199,22 @@
public void Rollback()
{
- this.CheckTransactionState();
+ lock (stateSyncRoot)
+ {
+ this.CheckTransactionState();
- lock (this.database.SyncObject)
- {
try
{
- this.database.Write(IscCodes.op_rollback);
- this.database.Write(this.handle);
- this.database.Flush();
+ lock (this.database.SyncObject)
+ {
+ this.database.Write(IscCodes.op_rollback);
+ this.database.Write(this.handle);
+ this.database.Flush();
- this.database.ReadResponse();
+ this.database.ReadResponse();
- this.database.TransactionCount--;
+ this.database.TransactionCount--;
+ }
if (this.Update != null)
{
@@ -215,17 +232,20 @@
public void CommitRetaining()
{
- this.CheckTransactionState();
+ lock (stateSyncRoot)
+ {
+ this.CheckTransactionState();
- lock (this.database.SyncObject)
- {
try
{
- this.database.Write(IscCodes.op_commit_retaining);
- this.database.Write(this.handle);
- this.database.Flush();
+ lock (this.database.SyncObject)
+ {
+ this.database.Write(IscCodes.op_commit_retaining);
+ this.database.Write(this.handle);
+ this.database.Flush();
- this.database.ReadResponse();
+ this.database.ReadResponse();
+ }
this.state = TransactionState.Active;
}
@@ -238,17 +258,20 @@
public void RollbackRetaining()
{
- this.CheckTransactionState();
+ lock (stateSyncRoot)
+ {
+ this.CheckTransactionState();
- lock (this.database.SyncObject)
- {
try
{
- this.database.Write(IscCodes.op_rollback_retaining);
- this.database.Write(this.handle);
- this.database.Flush();
+ lock (this.database.SyncObject)
+ {
+ this.database.Write(IscCodes.op_rollback_retaining);
+ this.database.Write(this.handle);
+ this.database.Flush();
- this.database.ReadResponse();
+ this.database.ReadResponse();
+ }
this.state = TransactionState.Active;
}
@@ -263,56 +286,62 @@
#region \xB7 Two Phase Commit Methods \xB7
- public void Prepare()
- {
- this.CheckTransactionState();
+ public void Prepare()
+ {
+ lock (stateSyncRoot)
+ {
+ this.CheckTransactionState();
- lock (this.database.SyncObject)
- {
- try
- {
- this.state = TransactionState.NoTransaction;
+ try
+ {
+ this.state = TransactionState.NoTransaction;
- this.database.Write(IscCodes.op_prepare);
- this.database.Write(this.handle);
- this.database.Flush();
+ lock (this.database.SyncObject)
+ {
+ this.database.Write(IscCodes.op_prepare);
+ this.database.Write(this.handle);
+ this.database.Flush();
- this.database.ReadResponse();
+ this.database.ReadResponse();
+ }
- this.state = TransactionState.Prepared;
- }
- catch (IOException)
- {
- throw new IscException(IscCodes.isc_net_read_err);
- }
- }
- }
+ this.state = TransactionState.Prepared;
+ }
+ catch (IOException)
+ {
+ throw new IscException(IscCodes.isc_net_read_err);
+ }
+ }
+ }
- public void Prepare(byte[] buffer)
- {
- this.CheckTransactionState();
+ public void Prepare(byte[] buffer)
+ {
+ lock (stateSyncRoot)
+ {
+ this.CheckTransactionState();
- lock (this.database.SyncObject)
- {
- try
- {
- this.state = TransactionState.NoTransaction;
+ try
+ {
+ this.state = TransactionState.NoTransaction;
- this.database.Write(IscCodes.op_prepare2);
- this.database.Write(this.handle);
- this.database.WriteBuffer(buffer, buffer.Length);
- this.database.Flush();
+ lock (this.database.SyncObject)
+ {
+ this.database.Write(IscCodes.op_prepare2);
+ this.database.Write(this.handle);
+ this.database.WriteBuffer(buffer, buffer.Length);
+ this.database.Flush();
- this.database.ReadResponse();
+ this.database.ReadResponse();
+ }
- this.state = TransactionState.Prepared;
- }
- catch (IOException)
- {
- throw new IscException(IscCodes.isc_net_read_err);
- }
- }
- }
+ this.state = TransactionState.Prepared;
+ }
+ catch (IOException)
+ {
+ throw new IscException(IscCodes.isc_net_read_err);
+ }
+ }
+ }
#endregion
@@ -322,10 +351,15 @@
{
if (this.state != TransactionState.Active)
{
- throw new IscException(IscCodes.isc_arg_gds, IscCodes.isc_tra_state, this.handle, "no valid");
+ throw GetNoValidTransactionException();
}
}
+ private IscException GetNoValidTransactionException()
+ {
+ return new IscException(IscCodes.isc_arg_gds, IscCodes.isc_tra_state, this.handle, "no valid");
+ }
+
#endregion
}
}
Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbConnectionInternal.cs
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbConnectionInternal.cs 2011-11-18 03:20:43 UTC (rev 53639)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbConnectionInternal.cs 2011-11-20 09:45:00 UTC (rev 53640)
@@ -32,389 +32,391 @@
namespace FirebirdSql.Data.FirebirdClient
{
- internal class FbConnectionInternal : MarshalByRefObject, IDisposable
- {
- #region \xB7 Fields \xB7
+ internal class FbConnectionInternal : MarshalByRefObject, IDisposable
+ {
+ #region \xB7 Fields \xB7
- private IDatabase db;
- private FbTransaction activeTransaction;
- private List<WeakReference> preparedCommands;
- private FbConnectionString options;
- private FbConnection owningConnection;
- private long created;
- private long lifetime;
- private bool pooled;
- private bool disposed;
+ private IDatabase db;
+ private FbTransaction activeTransaction;
+ private List<WeakReference> preparedCommands;
+ private FbConnectionString options;
+ private FbConnection owningConnection;
+ private long created;
+ private long lifetime;
+ private bool pooled;
+ private bool disposed;
+ private object preparedCommandsCleanupSyncRoot;
#if (!NET_CF)
- private FbEnlistmentNotification enlistmentNotification;
+ private FbEnlistmentNotification enlistmentNotification;
#endif
- #endregion
+ #endregion
- #region \xB7 Properties \xB7
+ #region \xB7 Properties \xB7
public IDatabase Database
{
get { return this.db; }
}
- public long Lifetime
- {
- get { return this.lifetime; }
- set { this.lifetime = value; }
- }
+ public long Lifetime
+ {
+ get { return this.lifetime; }
+ set { this.lifetime = value; }
+ }
- public long Created
- {
- get { return this.created; }
- set { this.created = value; }
- }
+ public long Created
+ {
+ get { return this.created; }
+ set { this.created = value; }
+ }
- public bool Pooled
- {
- get { return this.pooled; }
- set { this.pooled = value; }
- }
+ public bool Pooled
+ {
+ get { return this.pooled; }
+ set { this.pooled = value; }
+ }
- public bool HasActiveTransaction
- {
- get
- {
- return this.activeTransaction != null && !this.activeTransaction.IsUpdated;
- }
- }
+ public bool HasActiveTransaction
+ {
+ get
+ {
+ return this.activeTransaction != null && !this.activeTransaction.IsUpdated;
+ }
+ }
- public FbTransaction ActiveTransaction
- {
- get { return this.activeTransaction; }
- }
+ public FbTransaction ActiveTransaction
+ {
+ get { return this.activeTransaction; }
+ }
- public FbConnectionString ConnectionOptions
- {
- get { return this.options; }
- }
+ public FbConnectionString ConnectionOptions
+ {
+ get { return this.options; }
+ }
- public FbConnection OwningConnection
- {
- get { return this.owningConnection; }
- set { this.owningConnection = value; }
- }
+ public FbConnection OwningConnection
+ {
+ get { return this.owningConnection; }
+ set { this.owningConnection = value; }
+ }
- public bool IsEnlisted
- {
+ public bool IsEnlisted
+ {
#if (!NET_CF)
- get { return this.enlistmentNotification != null && !this.enlistmentNotification.IsCompleted; }
+ get { return this.enlistmentNotification != null && !this.enlistmentNotification.IsCompleted; }
#else
- get { return false; }
+ get { return false; }
#endif
- }
+ }
public bool CancelDisabled { get; set; }
- #endregion
+ #endregion
- #region \xB7 Constructors \xB7
+ #region \xB7 Constructors \xB7
- public FbConnectionInternal(FbConnectionString options)
- : this(options, null)
- {
- }
+ public FbConnectionInternal(FbConnectionString options)
+ : this(options, null)
+ {
+ }
- public FbConnectionInternal(FbConnectionString options, FbConnection owningConnection)
+ public FbConnectionInternal(FbConnectionString options, FbConnection owningConnection)
{
this.preparedCommands = new List<WeakReference>();
+ this.preparedCommandsCleanupSyncRoot = new object();
- this.options = options;
- this.owningConnection = owningConnection;
+ this.options = options;
+ this.owningConnection = owningConnection;
- GC.SuppressFinalize(this);
- }
+ GC.SuppressFinalize(this);
+ }
- #endregion
+ #endregion
- #region \xB7 Finalizer \xB7
+ #region \xB7 Finalizer \xB7
- ~FbConnectionInternal()
- {
- // Do not re-create Dispose clean-up code here.
- // Calling Dispose(false) is optimal in terms of
- // readability and maintainability.
- this.Dispose(false);
- }
+ ~FbConnectionInternal()
+ {
+ // Do not re-create Dispose clean-up code here.
+ // Calling Dispose(false) is optimal in terms of
+ // readability and maintainability.
+ this.Dispose(false);
+ }
- #endregion
+ #endregion
- #region \xB7 IDisposable Methods \xB7
+ #region \xB7 IDisposable Methods \xB7
- public void Dispose()
- {
- this.Dispose(true);
+ public void Dispose()
+ {
+ this.Dispose(true);
- // This object will be cleaned up by the Dispose method.
- // Therefore, you should call GC.SupressFinalize to
- // take this object off the finalization queue
- // and prevent finalization code for this object
- // from executing a second time.
- GC.SuppressFinalize(this);
- }
+ // This object will be cleaned up by the Dispose method.
+ // Therefore, you should call GC.SupressFinalize to
+ // take this object off the finalization queue
+ // and prevent finalization code for this object
+ // from executing a second time.
+ GC.SuppressFinalize(this);
+ }
- protected void Dispose(bool disposing)
- {
- lock (this)
- {
- if (!this.disposed)
- {
- // release any unmanaged resources
- this.Disconnect();
+ protected void Dispose(bool disposing)
+ {
+ lock (this)
+ {
+ if (!this.disposed)
+ {
+ // release any unmanaged resources
+ this.Disconnect();
- if (disposing)
- {
- // release managed resources here
- }
+ if (disposing)
+ {
+ // release managed resources here
+ }
- this.disposed = true;
- }
- }
- }
+ this.disposed = true;
+ }
+ }
+ }
- #endregion
+ #endregion
- #region \xB7 Create and Drop database methods \xB7
+ #region \xB7 Create and Drop database methods \xB7
- public void CreateDatabase(DatabaseParameterBuffer dpb)
- {
- IDatabase db = ClientFactory.CreateDatabase(this.options);
- db.CreateDatabase(dpb, this.options.DataSource, this.options.Port, this.options.Database);
- }
+ public void CreateDatabase(DatabaseParameterBuffer dpb)
+ {
+ IDatabase db = ClientFactory.CreateDatabase(this.options);
+ db.CreateDatabase(dpb, this.options.DataSource, this.options.Port, this.options.Database);
+ }
- public void DropDatabase()
- {
- IDatabase db = ClientFactory.CreateDatabase(this.options);
- db.Attach(this.BuildDpb(db, this.options), this.options.DataSource, this.options.Port, this.options.Database);
- db.DropDatabase();
- }
+ public void DropDatabase()
+ {
+ IDatabase db = ClientFactory.CreateDatabase(this.options);
+ db.Attach(this.BuildDpb(db, this.options), this.options.DataSource, this.options.Port, this.options.Database);
+ db.DropDatabase();
+ }
- #endregion
+ #endregion
- #region \xB7 Connect and Disconnect methods \xB7
+ #region \xB7 Connect and Disconnect methods \xB7
- public void Connect()
- {
- if (Charset.GetCharset(this.options.Charset) == null)
- {
- throw new FbException("Invalid character set specified");
- }
+ public void Connect()
+ {
+ if (Charset.GetCharset(this.options.Charset) == null)
+ {
+ throw new FbException("Invalid character set specified");
+ }
- try
- {
- this.db = ClientFactory.CreateDatabase(this.options);
- this.db.Charset = Charset.GetCharset(this.options.Charset);
- this.db.Dialect = this.options.Dialect;
- this.db.PacketSize = this.options.PacketSize;
+ try
+ {
+ this.db = ClientFactory.CreateDatabase(this.options);
+ this.db.Charset = Charset.GetCharset(this.options.Charset);
+ this.db.Dialect = this.options.Dialect;
+ this.db.PacketSize = this.options.PacketSize;
- DatabaseParameterBuffer dpb = this.BuildDpb(this.db, options);
+ DatabaseParameterBuffer dpb = this.BuildDpb(this.db, options);
- if (options.FallIntoTrustedAuth)
- {
- this.db.AttachWithTrustedAuth(dpb, this.options.DataSource, this.options.Port, this.options.Database);
- }
- else
- {
- this.db.Attach(dpb, this.options.DataSource, this.options.Port, this.options.Database);
- }
- }
- catch (IscException ex)
- {
- throw new FbException(ex.Message, ex);
- }
- }
+ if (options.FallIntoTrustedAuth)
+ {
+ this.db.AttachWithTrustedAuth(dpb, this.options.DataSource, this.options.Port, this.options.Database);
+ }
+ else
+ {
+ this.db.Attach(dpb, this.options.DataSource, this.options.Port, this.options.Database);
+ }
+ }
+ catch (IscException ex)
+ {
+ throw new FbException(ex.Message, ex);
+ }
+ }
- public void Disconnect()
- {
- if (this.db != null)
- {
- try
- {
- this.db.Dispose();
- }
- catch
- {
- }
- finally
- {
- this.db = null;
- this.owningConnection = null;
- this.options = null;
- this.lifetime = 0;
- this.pooled = false;
- }
- }
- }
+ public void Disconnect()
+ {
+ if (this.db != null)
+ {
+ try
+ {
+ this.db.Dispose();
+ }
+ catch
+ {
+ }
+ finally
+ {
+ this.db = null;
+ this.owningConnection = null;
+ this.options = null;
+ this.lifetime = 0;
+ this.pooled = false;
+ }
+ }
+ }
- #endregion
+ #endregion
- #region \xB7 Transaction Handling Methods \xB7
+ #region \xB7 Transaction Handling Methods \xB7
- public FbTransaction BeginTransaction(IsolationLevel level, string transactionName)
- {
- lock (this)
- {
- if (this.HasActiveTransaction)
- {
- throw new InvalidOperationException("A transaction is currently active. Parallel transactions are not supported.");
- }
+ public FbTransaction BeginTransaction(IsolationLevel level, string transactionName)
+ {
+ lock (this)
+ {
+ if (this.HasActiveTransaction)
+ {
+ throw new InvalidOperationException("A transaction is currently active. Parallel transactions are not supported.");
+ }
- try
- {
- this.activeTransaction = new FbTransaction(this.owningConnection, level);
- this.activeTransaction.BeginTransaction();
+ try
+ {
+ this.activeTransaction = new FbTransaction(this.owningConnection, level);
+ this.activeTransaction.BeginTransaction();
- if (transactionName != null)
- {
- this.activeTransaction.Save(transactionName);
- }
- }
- catch (IscException ex)
- {
- throw new FbException(ex.Message, ex);
- }
- }
+ if (transactionName != null)
+ {
+ this.activeTransaction.Save(transactionName);
+ }
+ }
+ catch (IscException ex)
+ {
+ throw new FbException(ex.Message, ex);
+ }
+ }
- return this.activeTransaction;
- }
+ return this.activeTransaction;
+ }
- public FbTransaction BeginTransaction(FbTransactionOptions options, string transactionName)
- {
- lock (this)
- {
- if (this.HasActiveTransaction)
- {
- throw new InvalidOperationException("A transaction is currently active. Parallel transactions are not supported.");
- }
+ public FbTransaction BeginTransaction(FbTransactionOptions options, string transactionName)
+ {
+ lock (this)
+ {
+ if (this.HasActiveTransaction)
+ {
+ throw new InvalidOperationException("A transaction is currently active. Parallel transactions are not supported.");
+ }
- try
- {
- this.activeTransaction = new FbTransaction(
- this.owningConnection, IsolationLevel.Unspecified);
+ try
+ {
+ this.activeTransaction = new FbTransaction(
+ this.owningConnection, IsolationLevel.Unspecified);
- this.activeTransaction.BeginTransaction(options);
+ this.activeTransaction.BeginTransaction(options);
- if (transactionName != null)
- {
- this.activeTransaction.Save(transactionName);
- }
- }
- catch (IscException ex)
- {
- throw new FbException(ex.Message, ex);
- }
- }
+ if (transactionName != null)
+ {
+ this.activeTransaction.Save(transactionName);
+ }
+ }
+ catch (IscException ex)
+ {
+ throw new FbException(ex.Message, ex);
+ }
+ }
- return this.activeTransaction;
- }
+ return this.activeTransaction;
+ }
- public void DisposeTransaction()
- {
- if (this.activeTransaction != null && !this.IsEnlisted)
- {
- this.activeTransaction.Dispose();
- this.activeTransaction = null;
- }
- }
+ public void DisposeTransaction()
+ {
+ if (this.activeTransaction != null && !this.IsEnlisted)
+ {
+ this.activeTransaction.Dispose();
+ this.activeTransaction = null;
+ }
+ }
- public void TransactionUpdated()
- {
- for (int i = 0; i < this.preparedCommands.Count; i++)
- {
+ public void TransactionUpdated()
+ {
+ for (int i = 0; i < this.preparedCommands.Count; i++)
+ {
if (!this.preparedCommands[i].IsAlive)
continue;
- FbCommand command = this.preparedCommands[i].Target as FbCommand;
+ FbCommand command = this.preparedCommands[i].Target as FbCommand;
- if (command.Transaction != null)
- {
- command.CloseReader();
- command.Transaction = null;
- }
- }
- }
+ if (command.Transaction != null)
+ {
+ command.CloseReader();
+ command.Transaction = null;
+ }
+ }
+ }
- #endregion
+ #endregion
- #region \xB7 Transaction Enlistement \xB7
+ #region \xB7 Transaction Enlistement \xB7
#if (!NET_CF)
- public void EnlistTransaction(System.Transactions.Transaction transaction)
- {
+ public void EnlistTransaction(System.Transactions.Transaction transaction)
+ {
if (this.owningConnection != null && this.options.Enlist)
- {
+ {
if (this.enlistmentNotification != null && this.enlistmentNotification.SystemTransaction == transaction)
return;
- if (this.HasActiveTransaction)
- {
- throw new ArgumentException("Unable to enlist in transaction, a local transaction already exists");
- }
- if (this.enlistmentNotification != null)
- {
- throw new ArgumentException("Already enlisted in a transaction");
- }
+ if (this.HasActiveTransaction)
+ {
+ throw new ArgumentException("Unable to enlist in transaction, a local transaction already exists");
+ }
+ if (this.enlistmentNotification != null)
+ {
+ throw new ArgumentException("Already enlisted in a transaction");
+ }
- this.enlistmentNotification = new FbEnlistmentNotification(this, transaction);
- this.enlistmentNotification.Completed += new EventHandler(EnlistmentCompleted);
- }
- }
+ this.enlistmentNotification = new FbEnlistmentNotification(this, transaction);
+ this.enlistmentNotification.Completed += new EventHandler(EnlistmentCompleted);
+ }
+ }
- private void EnlistmentCompleted(object sender, EventArgs e)
- {
- this.enlistmentNotification = null;
- }
+ private void EnlistmentCompleted(object sender, EventArgs e)
+ {
+ this.enlistmentNotification = null;
+ }
- public FbTransaction BeginTransaction(System.Transactions.IsolationLevel isolationLevel)
- {
- switch (isolationLevel)
- {
- case System.Transactions.IsolationLevel.Chaos:
- return this.BeginTransaction(System.Data.IsolationLevel.Chaos, null);
+ public FbTransaction BeginTransaction(System.Transactions.IsolationLevel isolationLevel)
+ {
+ switch (isolationLevel)
+ {
+ case System.Transactions.IsolationLevel.Chaos:
+ return this.BeginTransaction(System.Data.IsolationLevel.Chaos, null);
- case System.Transactions.IsolationLevel.ReadUncommitted:
- return this.BeginTransaction(System.Data.IsolationLevel.ReadUncommitted, null);
+ case System.Transactions.IsolationLevel.ReadUncommitted:
+ return this.BeginTransaction(System.Data.IsolationLevel.ReadUncommitted, null);
- case System.Transactions.IsolationLevel.RepeatableRead:
- return this.BeginTransaction(System.Data.IsolationLevel.RepeatableRead, null);
+ case System.Transactions.IsolationLevel.RepeatableRead:
+ return this.BeginTransaction(System.Data.IsolationLevel.RepeatableRead, null);
- case System.Transactions.IsolationLevel.Serializable:
- return this.BeginTransaction(System.Data.IsolationLevel.Serializable, null);
+ case System.Transactions.IsolationLevel.Serializable:
+ return this.BeginTransaction(System.Data.IsolationLevel.Serializable, null);
- case System.Transactions.IsolationLevel.Snapshot:
- return this.BeginTransaction(System.Data.IsolationLevel.Snapshot, null);
+ case System.Transactions.IsolationLevel.Snapshot:
+ return this.BeginTransaction(System.Data.IsolationLevel.Snapshot, null);
- case System.Transactions.IsolationLevel.Unspecified:
- return this.BeginTransaction(System.Data.IsolationLevel.Unspecified, null);
+ case System.Transactions.IsolationLevel.Unspecified:
+ return this.BeginTransaction(System.Data.IsolationLevel.Unspecified, null);
- case System.Transactions.IsolationLevel.ReadCommitted:
- default:
- return this.BeginTransaction(System.Data.IsolationLevel.ReadCommitted, null);
- }
- }
+ case System.Transactions.IsolationLevel.ReadCommitted:
+ default:
+ return this.BeginTransaction(System.Data.IsolationLevel.ReadCommitted, null);
+ }
+ }
#endif
- #endregion
+ #endregion
- #region \xB7 Schema Methods \xB7
+ #region \xB7 Schema Methods \xB7
- public DataTable GetSchema(string collectionName, string[] restrictions)
- {
- return FbSchemaFactory.GetSchema(this.owningConnection, collectionName, restrictions);
- }
+ public DataTable GetSchema(string collectionName, string[] restrictions)
+ {
+ return FbSchemaFactory.GetSchema(this.owningConnection, collectionName, restrictions);
+ }
- #endregion
+ #endregion
- #region \xB7 Prepared Commands Methods \xB7
+ #region \xB7 Prepared Commands Methods \xB7
- public void AddPreparedCommand(FbCommand command)
- {
+ public void AddPreparedCommand(FbCommand command)
+ {
int position = this.preparedCommands.Count;
for (int i = 0; i < this.preparedCommands.Count; i++)
{
@@ -429,20 +431,24 @@
}
}
this.preparedCommands.Insert(position, new WeakReference(command));
- }
+ }
- public void RemovePreparedCommand(FbCommand command)
- {
- for (int i = 0; i < this.preparedCommands.Count; i++)
+ public void RemovePreparedCommand(FbCommand command)
+ {
+ lock (preparedCommandsCleanupSyncRoot)
{
- if (this.preparedCommands[i].Target == command)
+ for (int i = this.preparedCommands.Count - 1; i >= 0; i--)
{
- this.preparedCommands[i].Target = null;
- this.preparedCommands.RemoveAt(i);
- return;
+ var cmd = this.preparedCommands[i];
+ if (cmd != null && cmd.Target == command)
+ {
+ cmd.Target = null;
+ this.preparedCommands.RemoveAt(i);
+ return;
+ }
}
}
- }
+ }
public void ReleasePreparedCommands()
{
@@ -473,84 +479,87 @@
}
}
- this.preparedCommands.Clear();
+ lock (preparedCommandsCleanupSyncRoot)
+ {
+ this.preparedCommands.Clear();
+ }
}
- #endregion
+ #endregion
- #region \xB7 Firebird Events Methods \xB7
+ #region \xB7 Firebird Events Methods \xB7
- public void CloseEventManager()
- {
- if (this.db != null && this.db.HasRemoteEventSupport)
- {
- lock (this.db)
- {
- this.db.CloseEventManager();
- }
- }
- }
+ public void CloseEventManager()
+ {
+ if (this.db != null && this.db.HasRemoteEventSupport)
+ {
+ lock (this.db)
+ {
+ this.db.CloseEventManager();
+ }
+ }
+ }
- #endregion
+ #endregion
- #region \xB7 Connection Verification \xB7
+ #region \xB7 Connection Verification \xB7
- public bool Verify()
- {
- // Do not actually ask for any information
- byte[] items = new byte[]
+ public bool Verify()
+ {
+ // Do not actually ask for any information
+ byte[] items = new byte[]
{
IscCodes.isc_info_end
};
- try
- {
- this.db.GetDatabaseInfo(items, 16);
+ try
+ {
+ this.db.GetDatabaseInfo(items, 16);
- return true;
- }
- catch
- {
- return false;
- }
- }
+ return true;
+ }
+ catch
+ {
+ return false;
+ }
+ }
- #endregion
+ #endregion
- #region \xB7 Private Methods \xB7
+ #region \xB7 Private Methods \xB7
- private DatabaseParameterBuffer BuildDpb(IDatabase db, FbConnectionString options)
- {
- DatabaseParameterBuffer dpb = new DatabaseParameterBuffer();
+ private DatabaseParameterBuffer BuildDpb(IDatabase db, FbConnectionString options)
+ {
+ DatabaseParameterBuffer dpb = new DatabaseParameterBuffer();
- dpb.Append(IscCodes.isc_dpb_version1);
- dpb.Append(IscCodes.isc_dpb_dummy_packet_interval, new byte[] { 120, 10, 0, 0 });
- dpb.Append(IscCodes.isc_dpb_sql_dialect, new byte[] { Convert.ToByte(options.Dialect), 0, 0, 0 });
- dpb.Append(IscCodes.isc_dpb_lc_ctype, options.Charset);
+ dpb.Append(IscCodes.isc_dpb_version1);
+ dpb.Append(IscCodes.isc_dpb_dummy_packet_interval, new byte[] { 120, 10, 0, 0 });
+ dpb.Append(IscCodes.isc_dpb_sql_dialect, new byte[] { Convert.ToByte(options.Dialect), 0, 0, 0 });
+ dpb.Append(IscCodes.isc_dpb_lc_ctype, options.Charset);
if (options.DbCachePages > 0)
{
dpb.Append(IscCodes.isc_dpb_num_buffers, options.DbCachePages);
}
- if (!string.IsNullOrEmpty(options.Role))
- {
- dpb.Append(IscCodes.isc_dpb_sql_role_name, options.Role);
- }
- dpb.Append(IscCodes.isc_dpb_connect_timeout, options.ConnectionTimeout);
+ if (!string.IsNullOrEmpty(options.Role))
+ {
+ dpb.Append(IscCodes.isc_dpb_sql_role_name, options.Role);
+ }
+ dpb.Append(IscCodes.isc_dpb_connect_timeout, options.ConnectionTimeout);
- if (!options.FallIntoTrustedAuth)
- {
- dpb.Append(IscCodes.isc_dpb_user_name, options.UserID);
- dpb.Append(IscCodes.isc_dpb_password, options.Password);
- }
+ if (!options.FallIntoTrustedAuth)
+ {
+ dpb.Append(IscCodes.isc_dpb_user_name, options.UserID);
+ dpb.Append(IscCodes.isc_dpb_password, options.Password);
+ }
dpb.Append(IscCodes.isc_dpb_process_id, GetProcessID());
dpb.Append(IscCodes.isc_dpb_process_name, GetProcessName());
- return dpb;
- }
+ return dpb;
+ }
- private string GetProcessName()
- {
+ private string GetProcessName()
+ {
#if (NET_CF)
// for CF we can implement GetModuleFileName from coredll
return "fbnetcf";
@@ -558,7 +567,7 @@
// showing ApplicationPhysicalPath may be wrong because of connection pooling; better idea?
return GetHostingPath() ?? GetRealProcessName();
#endif
- }
+ }
private string GetHostingPath()
@@ -585,7 +594,7 @@
{
return null;
}
- return (string)assembly
+ return (string)assembly
.GetType("System.Web.Hosting.HostingEnvironment")
.GetProperty("ApplicationPhysicalPath")
.GetValue(null, null);
@@ -604,7 +613,7 @@
}
private int GetProcessID()
- {
+ {
#if (NET_CF)
return -1;
#else
@@ -634,7 +643,7 @@
}
#endif
}
- #endregion
+ #endregion
#region Cancelation
public void EnableCancel()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|