Changeset 1496 for trunk/sources

Timestamp:

04/03/09 11:54:10 (15 years ago)

Author:

svonolfe

Message:

Added thread checking in session (#527)

Location:

trunk/sources/HeuristicLab.DataAccess.ADOHelper

Files:

• Session.cs (modified) (7 diffs)
• Transaction.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.DataAccess.ADOHelper/Session.cs

@@ -27 +27 @@
 using HeuristicLab.PluginInfrastructure;
 using System.Data.Common;
+using System.Threading;
 
 namespace HeuristicLab.DataAccess.ADOHelper {
@@ -39 +40 @@
     private DbConnection connection;
 
+    private Thread ownerThread;
+
     private IDictionary<Guid, object> adapters =
       new Dictionary<Guid, object>();
@@ -44 +47 @@
     public Session(SessionFactory factory) {
       this.factory = factory;
+      this.ownerThread = Thread.CurrentThread;
+    }
+
+    public void CheckThread() {
+      if (!Thread.CurrentThread.Equals(ownerThread)) {
+        throw new Exception("Session is owned by another thread");
+      }
     }
 
@@ -62 +72 @@
     #region ISession Members
     public ITransaction BeginTransaction() {
+      CheckThread();
+
       if (transaction == null) {
          transaction = new Transaction(this);
@@ -71 +83 @@
 
     public ITransaction GetCurrentTransaction() {
+      CheckThread();
+
       return transaction;
     }
@@ -76 +90 @@
     public IDataAdapter<ObjT> GetDataAdapter<ObjT>()
       where ObjT : IPersistableObject {
+      CheckThread();
+
       Guid adapterId = typeof(IDataAdapter<ObjT>).GUID;
 
@@ -94 +110 @@
       where T : class, IDataAdapter<ObjT>
     {
-        Guid adapterId = typeof(T).GUID;
+      CheckThread();
 
-        if (!adapters.ContainsKey(adapterId)) {
-          T adapter =
-            discoveryService.GetInstances<T>()[0];
+      Guid adapterId = typeof(T).GUID;
 
-          adapter.Session = this;
+      if (!adapters.ContainsKey(adapterId)) {
+        T adapter =
+          discoveryService.GetInstances<T>()[0];
 
-          adapters.Add(adapterId, adapter);
-        }
+        adapter.Session = this;
 
-        return adapters[adapterId] as T;
+        adapters.Add(adapterId, adapter);
+      }
+
+      return adapters[adapterId] as T;
     }
 
     public void EndSession() {
+      CheckThread();
+
       if (transaction != null) {
         transaction.Rollback();

trunk/sources/HeuristicLab.DataAccess.ADOHelper/Transaction.cs

@@ -38 +38 @@
     }
 
-    #region ITransaction Members
     public DbConnection Connection {
       set {
         if (value != null &&
           (transaction == null ||
-           !(transaction.Connection != null && 
+           !(transaction.Connection != null &&
              transaction.Connection.Equals(value)))) {
-            if (value.State != System.Data.ConnectionState.Open)
-              value.Open();
+          if (value.State != System.Data.ConnectionState.Open)
+            value.Open();
 
-            transaction = value.BeginTransaction(IsolationLevel.RepeatableRead);
+          transaction = value.BeginTransaction(IsolationLevel.RepeatableRead);
         }
       }
     }
 
+    #region ITransaction Members
     public void Commit() {
+      this.session.CheckThread();
+
       if (transaction != null) {
         DbConnection conn =
@@ -70 +72 @@
 
     public void Rollback() {
+      this.session.CheckThread();
+
       if (transaction != null) {
         DbConnection conn =
@@ -87 +91 @@
     public object InnerTransaction {
       get {
+        this.session.CheckThread();
+
         return transaction;
       }