diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2004-12-08 03:55:19 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2004-12-08 03:55:19 +0300 |
| commit | 8ee804b1c9cc92fd7bea45adb1270f3d5bbcbdf5 (patch) | |
| tree | 02fd494d20d5a4cf32ef58e6a7371eff7d72d9da | |
| parent | 9e3370d3351358044231dd1f3df5fff3720bdcc2 (diff) | |
2004-12-08 Zoltan Varga <vargaz@freemail.hu>mono-1-1-31-1-3
* reflection.c (mono_assembly_get_object): Add a workaround so __MetadataTypes won't
be visible in other appdomains.
svn path=/trunk/mono/; revision=37355
| -rw-r--r-- | mono/metadata/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/metadata/reflection.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index d3863d624ab..a41f5eedacc 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,8 @@ +2004-12-08 Zoltan Varga <vargaz@freemail.hu> + + * reflection.c (mono_assembly_get_object): Add a workaround so __MetadataTypes won't + be visible in other appdomains. + 2004-12-07 Ben Maurer <bmaurer@ximian.com> * threads.c: Interlocked inc and dec for longs were messed up, diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c index 66bdbc5233a..569775f8435 100644 --- a/mono/metadata/reflection.c +++ b/mono/metadata/reflection.c @@ -5072,6 +5072,11 @@ mono_assembly_get_object (MonoDomain *domain, MonoAssembly *assembly) mono_defaults.corlib, "System.Reflection", "Assembly"); res = (MonoReflectionAssembly *)mono_object_new (domain, System_Reflection_Assembly); res->assembly = assembly; + + /* FIXME: This is a workaround for 1.1.3 */ + if (!strcmp (assembly->aname.name, "__MetadataTypes")) + res->corlib_internal = TRUE; + CACHE_OBJECT (assembly, res, NULL); return res; } |