From: Zoltan Varga <vargaz@gmail.com>
Date: Thu, 12 Jan 2017 18:18:59 +0000 (-0500)
Subject: [runtime] Support TransparentProxy-es in mono_domain_from_appdomain ().
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=1121caa9635cfaf555981477acc57b5a0ff295b3;p=mono.git

[runtime] Support TransparentProxy-es in mono_domain_from_appdomain ().
---

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 9e23de19060..32f6a2ed4d4 100644
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -1815,6 +1815,11 @@ mono_domain_from_appdomain (MonoAppDomain *appdomain)
 {
 	if (appdomain == NULL)
 		return NULL;
+
+	if (appdomain->mbr.obj.vtable->klass == mono_defaults.transparent_proxy_class) {
+		MonoTransparentProxy *tp = (MonoTransparentProxy*)appdomain;
+		return mono_domain_get_by_id (tp->rp->target_domain_id);
+	}
 	
 	return appdomain->data;
 }