Changeset 5629

Timestamp:

03/08/11 11:37:43 (14 years ago)

Author:

gkronber

Message:

#1429 Improved plugin loading procedure to prevent exceptions when loading blocked plugins.

File:

• trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginValidator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginValidator.cs

@@ -508 +508 @@
           if (desc.PluginState != PluginState.Disabled) {
             try {
+              string assemblyName = (from assembly in AppDomain.CurrentDomain.ReflectionOnlyGetAssemblies()
+                                     where string.Equals(Path.GetFullPath(assembly.Location), Path.GetFullPath(assemblyLocation), StringComparison.CurrentCultureIgnoreCase)
+                                     select assembly.FullName).Single();
               // now load the assemblies into the execution context  
               // this can still lead to an exception
-              // even when the assembly was successfully loaded into the reflection only context before 
-              var asm = Assembly.LoadFrom(assemblyLocation);
+              // even when the assemby was successfully loaded into the reflection only context before 
+              var asm = Assembly.Load(assemblyName);
             }
             catch (BadImageFormatException) {
@@ -524 +527 @@
             catch (SecurityException) {
               desc.Disable("File " + Path.GetFileName(assemblyLocation) + " can't be loaded because of security constraints.");
+            }
+            catch (NotSupportedException ex) {
+              // disable the plugin
+              desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "NotSupportedException: " + ex.Message);
             }
           }