Changeset 6021 for trunk/sources

Timestamp:

04/18/11 17:33:41 (13 years ago)

Author:

gkronber

Message:

#1348: added ContainsKey check and throw ArgumentException with a more descriptive error message.

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3

Files:

• DefaultApplicationManager.cs (modified) (1 diff)
• Manager/PluginValidator.cs (modified) (1 diff)

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

@@ -151 +151 @@
     // register assembly in the assembly cache for the AssemblyResolveEvent
     private void RegisterLoadedAssembly(Assembly asm) {
+      if (loadedAssemblies.ContainsKey(asm.FullName) || loadedAssemblies.ContainsKey(asm.GetName().Name)) {
+        throw new ArgumentException("An assembly with the name " + asm.GetName().Name + " has been registered already.", "asm");
+      }
       loadedAssemblies.Add(asm.FullName, asm);
       loadedAssemblies.Add(asm.GetName().Name, asm); // add short name

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

@@ -606 +606 @@
     // register assembly in the assembly cache for the ReflectionOnlyAssemblyResolveEvent
     private void RegisterLoadedAssembly(Assembly asm) {
+      if (reflectionOnlyAssemblies.ContainsKey(asm.FullName) || reflectionOnlyAssemblies.ContainsKey(asm.GetName().Name)) {
+        throw new ArgumentException("An assembly with the name " + asm.GetName().Name + " has been registered already.", "asm");
+      }
       reflectionOnlyAssemblies.Add(asm.FullName, asm);
       reflectionOnlyAssemblies.Add(asm.GetName().Name, asm); // add short name