Fix the domains of the objects returned by AssemblyMirror.GetAssemblyObject ()/TypeMi...

diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AppDomainMirror.cs b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AppDomainMirror.cs
index 9c1da71e12baff2569809b70717f6d2df4e9e8bd..0b934c1d336cb15296e0a647bd5c0601eba377f8 100644 (file)
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AppDomainMirror.cs
+++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AppDomainMirror.cs
@@ -12,7 +12,8 @@ namespace Mono.Debugger.Soft
 
                public string FriendlyName {
                        get {
-                               if (friendly_name == null)
+                               /* The name can't be empty during domain creation */
+                               if (friendly_name == null || friendly_name == String.Empty)
                                        friendly_name = vm.conn.Domain_GetName (id);
                                return friendly_name;
                        }

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index 117664c0c782882b131e4c968daf04dc355996ab..b87a7556ec39a5ae4d9cf56e663ce1fd7d894bba 100644 (file)
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -6780,7 +6780,7 @@ assembly_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                break;
        }
        case CMD_ASSEMBLY_GET_OBJECT: {
-               MonoObject *o = (MonoObject*)mono_assembly_get_object (mono_domain_get (), ass);
+               MonoObject *o = (MonoObject*)mono_assembly_get_object (domain, ass);
                buffer_add_objid (buf, o);
                break;
        }
@@ -7264,7 +7264,7 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                break;
        }
        case CMD_TYPE_GET_OBJECT: {
-               MonoObject *o = (MonoObject*)mono_type_get_object (mono_domain_get (), &klass->byval_arg);
+               MonoObject *o = (MonoObject*)mono_type_get_object (domain, &klass->byval_arg);
                buffer_add_objid (buf, o);
                break;
        }