**** Backport of r130658 ****

2009-03-31  Martin Baulig  <martin@ximian.com>

	* debug-debugger.c (debugger_remove_breakpoint): Call
	mono_debugger_remove_class_init_callback ().

2009-03-31  Martin Baulig  <martin@ximian.com>

	* mono-debug-debugger.c
	(mono_debugger_register_class_init_callback): Also register the
	class init callback if the class is already initialized to make
	things work with shadow copied assemblies.

svn path=/branches/mono-2-4/mono/; revision=132891

mono/metadata/ChangeLog

@@ -8,6 +8,15 @@
 	* cominterop.c (ves_icall_System_Runtime_InteropServices_Marshal_ReleaseComObjectInternal):
 	changed to match .Net behaviour of not aborting on additional calls to ReleaseComObject.
 
+2009-03-31  Martin Baulig  <martin@ximian.com>
+
+	Backport of r130658.
+
+	* mono-debug-debugger.c
+	(mono_debugger_register_class_init_callback): Also register the
+	class init callback if the class is already initialized to make
+	things work with shadow copied assemblies.
+
 2009-04-27 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
 	* assembly.c: assemblies in the GAC should never be shadow-copied.

mono/metadata/mono-debug-debugger.c

@@ -205,10 +205,6 @@ mono_debugger_register_class_init_callback (MonoImage *image, const gchar *full_
 	mono_loader_lock ();
 
 	klass = mono_class_from_name (image, name_space ? name_space : "", name);
-	if (klass && klass->inited && klass->methods) {
-		mono_loader_unlock ();
-		return klass;
-	}
 
 	info = g_new0 (ClassInitCallback, 1);
 	info->image = image;
@@ -222,7 +218,7 @@ mono_debugger_register_class_init_callback (MonoImage *image, const gchar *full_
 
 	g_ptr_array_add (class_init_callbacks, info);
 	mono_loader_unlock ();
-	return NULL;
+	return klass;
 }
 
 void

mono/mini/ChangeLog

@@ -1,3 +1,10 @@
+2009-03-31  Martin Baulig  <martin@ximian.com>
+
+	Backport of r130658.
+
+	* debug-debugger.c (debugger_remove_breakpoint): Call
+	mono_debugger_remove_class_init_callback ().
+
 2009-04-22  Zoltan Varga  <vargaz@gmail.com>
 
 	* method-to-ir.c (mono_method_to_ir): Force init_locals to be TRUE

mono/mini/debug-debugger.c

@@ -308,7 +308,7 @@ debugger_insert_source_breakpoint (guint64 image_argument, guint64 token, guint6
 	mono_debugger_lock ();
 
 	klass = mono_debugger_register_class_init_callback (image, class_name, token, index);
-	if (!klass) {
+	if (!klass || !klass->inited || !klass->methods) {
 		mono_debugger_unlock ();
 		return 0;
 	}
@@ -354,6 +354,7 @@ debugger_remove_breakpoint (guint64 index, G_GNUC_UNUSED guint64 dummy)
 {
 	mono_debugger_lock ();
 	mono_debugger_remove_method_breakpoint (index);
+	mono_debugger_remove_class_init_callback (index);
 	mono_debugger_unlock ();
 }