Changeset 9634 for branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

Timestamp:

06/17/13 10:51:42 (11 years ago)

Author:

pfleck

Message:

#2030:
Updated license year in headers and AssemblyInfo.
Removed empty regions in OptimizedHiveDao and IOptimizedHiveDao.
The ServiceLocator handles creation of the OptimizedHiveDao different to make the OptimizedHiveDao available for non-service operation calls:

• if the ServiceLocator is called _within_ a service operation, the same DB-context is used for the whole service operation, and therefore is stored in the service operation context.
• if the ServiceLocator is called _outside_ a service operation, a new DB-context is created on each ServiceLocator call.

File:

• branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (1 diff)

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

@@ -42 +42 @@
     }
 
-    private IOptimizedHiveDao optimizedHiveDao;
     public IOptimizedHiveDao OptimizedHiveDao {
       get {
-        if (optimizedHiveDao == null) optimizedHiveDao = new OptimizedHiveDao();
-        return optimizedHiveDao;
+        var dataContext = HiveOperationContext.Current != null
+                            ? HiveOperationContext.Current.DataContext
+                            : new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
+        return new OptimizedHiveDao(dataContext);
       }
     }