mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs
View File

@@ -33,11 +33,7 @@ using System.Data.Common;
namespace System.Data.OleDb
{
#if NET_2_0
public sealed class OleDbTransaction : DbTransaction, IDbTransaction
#else
public sealed class OleDbTransaction : MarshalByRefObject, IDbTransaction, IDisposable
#endif
{
#region Fields
@@ -106,22 +102,12 @@ namespace System.Data.OleDb
}
}
#if NET_2_0
protected override DbConnection DbConnection {
get { return connection; }
}
#else
IDbConnection IDbTransaction.Connection {
get {
return connection;
}
}
#endif
public
#if NET_2_0
override
#endif
IsolationLevel IsolationLevel {
get {
if (!isOpen)
@@ -160,9 +146,7 @@ namespace System.Data.OleDb
}
public
#if NET_2_0
override
#endif
void Commit ()
{
if (!isOpen)
@@ -175,17 +159,8 @@ namespace System.Data.OleDb
isOpen = false;
}
#if ONLY_1_1
~OleDbTransaction ()
{
libgda.FreeObject (gdaTransaction);
gdaTransaction = IntPtr.Zero;
}
#endif
#if NET_2_0
protected override
#endif
void Dispose (bool disposing)
{
if (!disposed) {
@@ -194,22 +169,12 @@ namespace System.Data.OleDb
disposed = true;
}
#if NET_2_0
base.Dispose (disposing);
#endif
}
#if !NET_2_0
void IDisposable.Dispose ()
{
Dispose (true);
}
#endif
public
#if NET_2_0
override
#endif
void Rollback ()
{
if (!isOpen)