Fix delegate combine when left side has already been invoked.

mono · Jun 11, 2013 · c9b90f8 · c9b90f8
1 parent f9dac2e
commit c9b90f8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/mcs/class/corlib/System/MulticastDelegate.cs b/mcs/class/corlib/System/MulticastDelegate.cs
@@ -162,6 +162,7 @@ protected sealed override Delegate CombineImpl (Delegate follow)
 				clone = clone.prev;
 			}
 
+			clone.SetMulticastInvoke ();
 			clone.prev = (MulticastDelegate)this.Clone ();
 
 			for (clone = clone.prev, orig = this.prev; orig != null; orig = orig.prev) {

diff --git a/mcs/class/corlib/Test/System/MulticastDelegate.cs b/mcs/class/corlib/Test/System/MulticastDelegate.cs
@@ -98,5 +98,35 @@ public void TestCombineRemove()
 		res = del1( ref val );
 		Assert.AreEqual("abbcbbd", val , "#A05");
 	}
+
+	[Test] //Bug #12536
+	public void TestCombineBothDirections ()
+	{
+		MyDelegate dela = new MyDelegate( MethodA );
+		MyDelegate delb = new MyDelegate( MethodB );
+		MyDelegate delc = new MyDelegate( MethodC );
+		MyDelegate deld = new MyDelegate( MethodD );
+
+		string val;
+		char res;
+
+		MyDelegate a = dela + delb;
+		val = "";
+		res = a (ref val);
+		Assert.AreEqual ("ab", val, "#1");
+		Assert.AreEqual ('b', res, "#2");
+
+		MyDelegate b = delc + deld;
+		val = "";
+		res = b (ref val);
+		Assert.AreEqual ("cd", val, "#3");
+		Assert.AreEqual ('d', res, "#4");
+
+		MyDelegate c = a + b;
+		val = "";
+		res = c (ref val);
+		Assert.AreEqual ("abcd", val, "#5");
+		Assert.AreEqual ('d', res, "#6");
+	}
 }
 }