Changeset 6426 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

Timestamp:

06/16/11 12:39:32 (13 years ago)

Author:

ascheibe

Message:

#1233 removed useLocalPlugins

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -98 +98 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       //trans.UseTransaction(() => { // cneumuel: try without transaction
-        jobData.LastUpdate = DateTime.Now;
-        dao.UpdateJob(job);
-        dao.UpdateJobData(jobData);
+      jobData.LastUpdate = DateTime.Now;
+      dao.UpdateJob(job);
+      dao.UpdateJobData(jobData);
       //}, false, true);
     }
@@ -285 +285 @@
         plugin.UserId = author.UserId;
         plugin.DateCreated = DateTime.Now;
-        if (!plugin.IsLocal) {
-          var existing = dao.GetPlugins(x => x.Hash != null && !x.IsLocal).Where(x => x.Hash.SequenceEqual(plugin.Hash));
-
-          if (existing.Count() > 0) {
-            // a plugin with the same name and version already exists.
-            throw new FaultException<PluginAlreadyExistsFault>(new PluginAlreadyExistsFault(existing.Single().Id));
-          }
-        }
+
+        var existing = dao.GetPlugins(x => x.Hash != null).Where(x => x.Hash.SequenceEqual(plugin.Hash));
+        if (existing.Count() > 0) {
+          // a plugin already exists.
+          throw new FaultException<PluginAlreadyExistsFault>(new PluginAlreadyExistsFault(existing.Single().Id));
+        }
+
         Guid pluginId = dao.AddPlugin(plugin);
         foreach (PluginData pluginData in pluginDatas) {
@@ -309 +308 @@
     public IEnumerable<Plugin> GetPlugins() {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      return dao.GetPlugins(x => x.IsLocal == false);
+      return dao.GetPlugins(x => x.Hash != null);
     }