Fixing UWP support for manually generated proxy classes

Code-Sharp · Jul 20, 2018 · 89b429e · 89b429e
1 parent b18b153
commit 89b429e
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/net45/WampSharp/WAMP2/V2/System.Reflection.DispatchProxy/WampCalleeClientProxyFactory.cs b/src/net45/WampSharp/WAMP2/V2/System.Reflection.DispatchProxy/WampCalleeClientProxyFactory.cs
@@ -1,5 +1,6 @@
 #if DISPATCH_PROXY
 
+using System;
 using System.Reflection;
 using WampSharp.V2.Client;
 
@@ -8,23 +9,32 @@ namespace WampSharp.V2.CalleeProxy
 {
     internal class WampCalleeClientProxyFactory : IWampCalleeProxyFactory
     {
+        private readonly IWampRealmProxy mProxy;
         private readonly WampCalleeProxyInvocationHandler mHandler;
 
         public WampCalleeClientProxyFactory(IWampRealmProxy proxy)
         {
+            mProxy = proxy;
             mHandler = new ClientInvocationHandler(proxy);
         }
 
         public virtual TProxy GetProxy<TProxy>(ICalleeProxyInterceptor interceptor) where TProxy : class
         {
-            TProxy result = DispatchProxy.Create<TProxy, CalleeProxy>();
+            if (typeof(CalleeProxyBase).IsAssignableFrom(typeof(TProxy)))
+            {
+                return (TProxy) Activator.CreateInstance(typeof(TProxy), mProxy, interceptor);
+            }
+            else
+            {
+                TProxy result = DispatchProxy.Create<TProxy, CalleeProxy>();
 
-            CalleeProxy casted = result as CalleeProxy;
+                CalleeProxy casted = result as CalleeProxy;
 
-            casted.Handler = mHandler;
-            casted.CalleeProxyInterceptor = interceptor;
+                casted.Handler = mHandler;
+                casted.CalleeProxyInterceptor = interceptor;
 
-            return result;
+                return result;
+            }
         }
     }
 }