From 1121caa9635cfaf555981477acc57b5a0ff295b3 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 12 Jan 2017 13:18:59 -0500 Subject: [PATCH] [runtime] Support TransparentProxy-es in mono_domain_from_appdomain (). --- mono/metadata/appdomain.c | 5 +++++ 1 file changed, 5 insertions(+) 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; } -- 2.25.1