Changeset 1152 for trunk/sources/HeuristicLab.Hive.Server.ADODataAccess

Timestamp:

01/16/09 10:24:11 (15 years ago)

Author:

svonolfe

Message:

Fixed possible race condition in DAL (#372)

File:

• trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/CachedDataAdapter.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/CachedDataAdapter.cs

@@ -105 +105 @@
     protected virtual ObjT FindSingle(Selector dbSelector,
       Selector cacheSelector) {
+      ObjT obj = default(ObjT);
+
+      cacheLock.AcquireReaderLock(Timeout.Infinite);
+
       RowT row = FindSingleRow(dbSelector, cacheSelector);
 
       if (row != null) {
-        ObjT obj = new ObjT();
+        obj = new ObjT();
         obj = Convert(row, obj);
-        
-        return obj;
-      } else {
-        return default(ObjT);
-      }
+      }
+
+      cacheLock.ReleaseReaderLock();
+
+      return obj;
     }
 
@@ -178 +182 @@
 
     protected override RowT GetRowById(long id) {
+      cacheLock.AcquireReaderLock(Timeout.Infinite);
+
       RowT row =
         FindCachedById(id);
 
+      //not in cache
       if (row == null)
         row = FindSingleRow(
@@ -186 +193 @@
             return FindById(id);
           });
+
+      cacheLock.ReleaseReaderLock();
 
       return row;