cadmium-im/zirconium-sharp
1
0
Fork 0
mirror of https://github.com/cadmium-im/zirconium-sharp.git synced 2024-11-22 10:22:23 +00:00
Code Issues Projects Releases Wiki Activity

Add throwing right exception when invoking exported plugin method in IPCRouter

Browse Source
This commit is contained in:
ChronosX88 2020-10-07 18:46:27 +04:00
parent bd74068d6f
commit 05ea6457bd
Signed by: ChronosXYZ
GPG Key ID: 085A69A82C8C511A
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Zirconium/Core/Plugins/IPC/IPCRouter.cs
View File

@ -1,3 +1,4 @@
using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Linq; using System.Linq;
using System; using System;
@ -36,7 +37,15 @@ namespace Zirconium.Core.Plugins.IPC
return Task.Factory.StartNew<dynamic>(() => return Task.Factory.StartNew<dynamic>(() =>
{ {
var method = methodTable[pluginName].Where(x => x.MethodName == methodName).FirstOrDefault(); var method = methodTable[pluginName].Where(x => x.MethodName == methodName).FirstOrDefault();
var returnValue = method.Method.Invoke(method.Service, new object[] {paramsObject}); object returnValue = null;
try
{
returnValue = method.Method.Invoke(method.Service, new object[] { paramsObject });
}
catch (TargetInvocationException e)
{
throw e.InnerException;
}
return returnValue; return returnValue;
}); });
} }
@ -46,7 +55,14 @@ namespace Zirconium.Core.Plugins.IPC
return Task.Factory.StartNew(() => return Task.Factory.StartNew(() =>
{ {
var method = methodTable[pluginName].Where(x => x.MethodName == methodName).FirstOrDefault(); var method = methodTable[pluginName].Where(x => x.MethodName == methodName).FirstOrDefault();
method.Method.Invoke(method.Service, paramsObject); try
{
method.Method.Invoke(method.Service, new object[] { paramsObject });
}
catch (TargetInvocationException e)
{
throw e.InnerException;
}
}); });
} }
} }