Merge pull request #1698 from ludovic-henry/socket-reorg-2

[mono.git] / mono / metadata / domain.c

diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
index 801d58e41629f0b6beefca40b87d97271b9d2ba1..d2d92fd51c9868342956d7ca8876457c1d0fca8f 100755 (executable)
--- a/mono/metadata/domain.c
+++ b/mono/metadata/domain.c
@@ -600,9 +600,6 @@ mono_init_internal (const char *filename, const char *exe_filename, const char *
        }
        mono_defaults.corlib = mono_assembly_get_image (ass);
 
-       /* might be NULL if System.dll is not yet loaded */
-       mono_defaults.system = mono_image_loaded ("System");
-
        mono_defaults.object_class = mono_class_from_name (
                 mono_defaults.corlib, "System", "Object");
        g_assert (mono_defaults.object_class != 0);
@@ -716,6 +713,10 @@ mono_init_internal (const char *filename, const char *exe_filename, const char *
                 mono_defaults.corlib, "System", "MonoType");
        g_assert (mono_defaults.monotype_class != 0);
 
+       mono_defaults.runtimetype_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "RuntimeType");
+       g_assert (mono_defaults.runtimetype_class != 0);
+
        mono_defaults.exception_class = mono_class_from_name (
                 mono_defaults.corlib, "System", "Exception");
        g_assert (mono_defaults.exception_class != 0);