[svn] r7428: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/Intell...

[VladD2]

Log:
Fix assemblyLoadFrom() (check same assembly loaded by different way).

Author: VladD2
Date: Thu Feb 15 03:07:05 2007
New Revision: 7428

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeLibraryReferenceManager.n

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeLibraryReferenceManager.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeLibraryReferenceManager.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeLibraryReferenceManager.n	Thu Feb 15 03:07:05 2007
@@ -59,12 +59,19 @@
     {
       mutable assembly;
 
-      unless (assByString.TryGetValue (path, out assembly)) 
+      unless (assByString.TryGetValue(path, out assembly)) 
       {
+        mutable assembly2;
         assembly = base.assemblyLoadFrom(path);
+
+        if (assByStrongName.TryGetValue(assembly.FullName, out assembly2))
+          assembly = assembly2;
+        else
+        {
         assByString.Add(path, assembly);
         assByStrongName.Add(assembly.FullName, assembly);
       }
+      }
 
       assembly
     }