Changeset 2095 for trunk/sources

Timestamp:

06/25/09 12:48:29 (15 years ago)

Author:

svonolfe

Message:

Updated SessionFactory (#372)

Location:

trunk/sources/HeuristicLab.DataAccess.ADOHelper/3.2

Files:

• Session.cs (modified) (4 diffs)
• SessionFactory.cs (modified) (2 diffs)

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

@@ -42 +42 @@
     private Thread ownerThread;
 
+    private int counter;
+
     private IDictionary<Guid, object> adapters =
       new Dictionary<Guid, object>();
@@ -48 +50 @@
       this.factory = factory;
       this.ownerThread = Thread.CurrentThread;
+      this.counter = 0;
     }
 
@@ -68 +71 @@
     public void DetachTrasaction() {
       this.transaction = null;
+    }
+
+    public void IncrementCounter() {
+      this.counter++;
     }
 
@@ -127 +134 @@
 
     public void EndSession() {
-      CheckThread();
+      this.counter--;
 
-      if (transaction != null) {
-        transaction.Rollback();
-        transaction = null;
+      if (counter <= 0) {
+        CheckThread();
+
+        if (transaction != null) {
+          transaction.Rollback();
+          transaction = null;
+        }
+        if (connection.State == System.Data.ConnectionState.Open) {
+          connection.Close();
+          connection = null;
+        }
+        factory.EndSession(this);
       }
-      if (connection.State == System.Data.ConnectionState.Open) {
-        connection.Close();
-        connection = null;
-      }
-      factory.EndSession(this);
     }
 

trunk/sources/HeuristicLab.DataAccess.ADOHelper/3.2/SessionFactory.cs

@@ -31 +31 @@
 namespace HeuristicLab.DataAccess.ADOHelper {
   public class SessionFactory: ISessionFactory {
-    private IDictionary<Thread, ISession> sessions =
-      new Dictionary<Thread, ISession>();
+    private IDictionary<Thread, Session> sessions =
+      new Dictionary<Thread, Session>();
 
     public Type DbConnectionType { get;  set; }
@@ -86 +86 @@
         }
 
+        sessions[current].IncrementCounter();
+
         return sessions[current];
       }