2003-12-16 Zoltan Varga <[email protected]>

	* Assembly.cs (GetManifestResourceStream): Only load non-embedded
	resources from files.

svn path=/trunk/mcs/; revision=21256

mcs/class/corlib/System.Reflection/Assembly.cs

@@ -171,7 +171,7 @@ namespace System.Reflection {
 
 			if (info.ReferencedAssembly != null)
 				return info.ReferencedAssembly.GetManifestResourceStream (name);
-			if (info.FileName != null) {
+			if ((info.FileName != null) && (info.ResourceLocation == 0)) {
 				string filename = Path.Combine (Path.GetDirectoryName (Location),
 											info.FileName);
 				return new FileStream (filename, FileMode.Open, FileAccess.Read);

mcs/class/corlib/System.Reflection/ChangeLog

@@ -1,3 +1,8 @@
+2003-12-16  Zoltan Varga  <[email protected]>
+
+	* Assembly.cs (GetManifestResourceStream): Only load non-embedded
+	resources from files.
+
 2003-12-15  Zoltan Varga  <[email protected]>
 
 	* MonoField.cs (SetValue): Throw an exception if the value cannot be