[Monodevelop-patches-list] r641 - trunk/MonoDevelop/src/Main/Base/Services/ParserService

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-01-24 22:13:46 -0500 (Sat, 24 Jan 2004)
New Revision: 641

Modified:
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
Log:
this should fix chipzz's bug in db generation and *hopefully* not break anything else.


Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs	2004-01-25 03:03:56 UTC (rev 640)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs	2004-01-25 03:13:46 UTC (rev 641)
@@ -90,7 +90,12 @@
 				}
 			}
 			
-			System.Reflection.Assembly asm = /* nonLocking ? Assembly.Load(GetBytes(fileName)) : */ Assembly.LoadFrom(fileName);
+			System.Reflection.Assembly asm;
+			try {
+				asm = Assembly.Load(fileName);
+			} catch {
+				asm = Assembly.LoadFrom (fileName);
+			}
 			foreach (Type type in asm.GetTypes()) {
 				if (!type.FullName.StartsWith("<")) {
 					classes.Add(new ReflectionClass(type, docuNodes));

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-01-25 03:03:56 UTC (rev 640)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-01-25 03:13:46 UTC (rev 641)
@@ -148,7 +148,7 @@
 					string path = fileUtilityService.GetDirectoryNameWithSeparator(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory());
 
 					AssemblyInformation frameworkAssemblyInformation = new AssemblyInformation();
-					frameworkAssemblyInformation.Load(String.Concat(path, assemblyList[i], ".dll"), false);
+					frameworkAssemblyInformation.Load(assemblyList[i], false);
 					// create all class proxies
 					foreach (IClass newClass in frameworkAssemblyInformation.Classes) {
 						ClassProxy newProxy = new ClassProxy(newClass);