2004-05-28 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* appdomain.c:
	* object.c: only the domain in which Main is run have
	SetupInformation.ConfigurationFile set, so moved a few lines from
	appdomain.c to object.c.

svn path=/trunk/mono/; revision=28324

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 17587f5b637fd9a5e806e24816dfd4e2a99a409d..1e3772e0337fac90410720fa24d00c7cbd4c978a 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * appdomain.c:
+       * object.c: only the domain in which Main is run have
+       SetupInformation.ConfigurationFile set, so moved a few lines from
+       appdomain.c to object.c.
+
 2004-05-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * appdomain.c: we tried to load [name].(dll|exe), but according

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 44fd26432ac70b5dc272a14493995b96fa54fe74..f2bd2f8241d70435c2a15d0317499eded089c22d 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -266,8 +266,6 @@ ves_icall_System_AppDomainSetup_InitAppDomainSetup (MonoAppDomainSetup *setup)
 {
        MonoDomain* domain = mono_domain_get ();
        MonoAssembly *assembly;
-       gchar *str;
-       gchar *config_suffix;
        
        MONO_ARCH_SAVE_REGS;
 
@@ -279,12 +277,6 @@ ves_icall_System_AppDomainSetup_InitAppDomainSetup (MonoAppDomainSetup *setup)
        g_assert (assembly);
 
        setup->application_base = mono_string_new (domain, assembly->basedir);
-
-       config_suffix = g_strconcat (assembly->aname.name, ".exe.config", NULL);
-       str = g_build_filename (assembly->basedir, config_suffix, NULL);
-       g_free (config_suffix);
-       setup->configuration_file = mono_string_new (domain, str);
-       g_free (str);
 }
 
 MonoObject *

diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 86b96b32a85430c60fe6ae0ca0fe331d471ab106..932a95ad1e384b62e3c052513d3fcb5a30b9fc5d 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -1436,8 +1436,16 @@ mono_runtime_exec_main (MonoMethod *method, MonoArray *args, MonoObject **exc)
 
        domain = mono_object_domain (args);
        if (!domain->entry_assembly) {
+               gchar *str;
+               gchar *config_suffix;
+
                domain->entry_assembly = method->klass->image->assembly;
                ves_icall_System_AppDomainSetup_InitAppDomainSetup (domain->setup);
+               config_suffix = g_strconcat (domain->entry_assembly->aname.name, ".exe.config", NULL);
+               str = g_build_filename (domain->entry_assembly->basedir, config_suffix, NULL);
+               g_free (config_suffix);
+               domain->setup->configuration_file = mono_string_new (domain, str);
+               g_free (str);
        }
 
        /* FIXME: check signature of method */