Changeset 6452 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Util

Timestamp:

06/20/11 14:16:53 (13 years ago)

Author:

cneumuel

Message:

#1233

• renamed UptimeCalendar and Appointment to Downtime
• added service methods to delete plugins and get plugin by hash
• made reverted TransactionManager change, made it non-static and added interface
• moved magic numbers to application settings

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Util/PluginUtil.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Util/PluginUtil.cs

@@ -30 +30 @@
 namespace HeuristicLab.Clients.Hive {
   public static class PluginUtil {
-    private static object locker = new object();
 
     /// <summary>
@@ -41 +40 @@
     /// <returns></returns>
     public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins) {
-      lock (locker) {
-        var pluginIds = new List<Guid>();
-        Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
+      var pluginIds = new List<Guid>();
+      Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
 
-        foreach (var neededPlugin in checksumsNeededPlugins) {
-          Plugin foundPlugin = alreadyUploadedPlugins.FirstOrDefault(p => p.Hash.SequenceEqual(neededPlugin.Value));
+      foreach (var neededPlugin in checksumsNeededPlugins) {
+        Plugin foundPlugin = alreadyUploadedPlugins.FirstOrDefault(p => p.Hash.SequenceEqual(neededPlugin.Value));
+        if (foundPlugin == null) {
+          foundPlugin = onlinePlugins.FirstOrDefault(p => {
+            if (p.Hash != null) {
+              return p.Hash.SequenceEqual(neededPlugin.Value);
+            } else {
+              return false;
+            }
+          });
+
           if (foundPlugin == null) {
-            foundPlugin = onlinePlugins.FirstOrDefault(p => {
-              if (p.Hash != null) {
-                return p.Hash.SequenceEqual(neededPlugin.Value);
-              } else {
-                return false;
-              }
-            });
-
-            if (foundPlugin == null) {
-              Plugin p = CreatePlugin(neededPlugin.Key, neededPlugin.Value);
-              List<PluginData> pd = CreatePluginDatas(neededPlugin.Key);
-              try {
-                p.Id = service.AddPlugin(p, pd);
-                alreadyUploadedPlugins.Add(p);
-                pluginIds.Add(p.Id);
-              }
-              catch (FaultException<PluginAlreadyExistsFault> fault) {
-                onlinePlugins.Add(service.GetPlugin(fault.Detail.Id));
-              }
-            } else {
-              pluginIds.Add(foundPlugin.Id);
+            Plugin p = CreatePlugin(neededPlugin.Key, neededPlugin.Value);
+            List<PluginData> pd = CreatePluginDatas(neededPlugin.Key);
+            try {
+              p.Id = service.AddPlugin(p, pd);
+              alreadyUploadedPlugins.Add(p);
+              pluginIds.Add(p.Id);
+            }
+            catch (FaultException<PluginAlreadyExistsFault> fault) {
+              onlinePlugins.Add(service.GetPlugin(fault.Detail.Id));
             }
           } else {
             pluginIds.Add(foundPlugin.Id);
           }
+        } else {
+          pluginIds.Add(foundPlugin.Id);
         }
-        return pluginIds;
       }
+      return pluginIds;
     }