Changeset 7586

Timestamp:

03/08/12 11:19:37 (13 years ago)

Author:

mkommend

Message:

#1792: Readded check if assembly location is null or string.Emtpy in type discovery.

File:

• trunk/sources/HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs

@@ -119 +119 @@
       try {
         runnablePlugin.Run();
-      } finally {
+      }
+      finally {
         // unload plugins in reverse order
         foreach (var plugin in loadedPlugins.Reverse<IPlugin>()) {
@@ -149 +150 @@
       foreach (Type t in GetTypes(typeof(T), plugin, onlyInstantiable: true, includeGenericTypeDefinitions: false)) {
         T instance = null;
-        try { instance = (T)Activator.CreateInstance(t); } catch { }
+        try { instance = (T)Activator.CreateInstance(t); }
+        catch { }
         if (instance != null) instances.Add(instance);
       }
@@ -164 +166 @@
       foreach (Type t in GetTypes(typeof(T), asm, onlyInstantiable: true, includeGenericTypeDefinitions: false)) {
         T instance = null;
-        try { instance = (T)Activator.CreateInstance(t); } catch { }
+        try { instance = (T)Activator.CreateInstance(t); }
+        catch { }
         if (instance != null) instances.Add(instance);
       }
@@ -188 +191 @@
       foreach (Type t in GetTypes(type, onlyInstantiable: true, includeGenericTypeDefinitions: false)) {
         object instance = null;
-        try { instance = Activator.CreateInstance(t); } catch { }
+        try { instance = Activator.CreateInstance(t); }
+        catch { }
         if (instance != null) instances.Add(instance);
       }
@@ -231 +235 @@
       PluginDescription pluginDesc = (PluginDescription)pluginDescription;
       return from asm in AppDomain.CurrentDomain.GetAssemblies()
-             where !asm.IsDynamic
+             where !asm.IsDynamic && !string.IsNullOrEmpty(asm.Location)
              where pluginDesc.AssemblyLocations.Any(location => location.Equals(Path.GetFullPath(asm.Location), StringComparison.CurrentCultureIgnoreCase))
              from t in GetTypes(type, asm, onlyInstantiable, includeGenericTypeDefinitions)
@@ -299 +303 @@
           if (type.IsAssignableFrom(otherGenericTypeDefinition.MakeGenericType(typeGenericArguments)))
             return true;
-        } catch (Exception) { }
+        }
+        catch (Exception) { }
       }
       return false;