diff --git a/Example.Backend/Printer.cs b/Example.Backend/Printer.cs index ba8c624..92960e4 100644 --- a/Example.Backend/Printer.cs +++ b/Example.Backend/Printer.cs @@ -1,4 +1,6 @@ using System; +using System.Security.Cryptography; +using System.Text; using System.Threading; using System.Threading.Tasks; using Example.Shared; @@ -22,7 +24,7 @@ namespace Example.Backend public void Dispose() { - Console.WriteLine("Dispose printer with name {0}", Name); + Console.WriteLine("Dispose printer with name {0}, Dispose works, Dispose works, Dispose works, Dispose works,", Name); } } } \ No newline at end of file diff --git a/Example.Frontend/Program.cs b/Example.Frontend/Program.cs index 44860ad..6ac3cb7 100644 --- a/Example.Frontend/Program.cs +++ b/Example.Frontend/Program.cs @@ -75,6 +75,8 @@ class Program Console.WriteLine("Page printed"); var data = page.Value.GetData(); Console.WriteLine("Data : {0}", Encoding.UTF8.GetString(data)); + + Console.WriteLine("Dispose printer"); } diff --git a/mROA/Implementation/Backend/BasicExecutionModule.cs b/mROA/Implementation/Backend/BasicExecutionModule.cs index 01343ca..8e8114e 100644 --- a/mROA/Implementation/Backend/BasicExecutionModule.cs +++ b/mROA/Implementation/Backend/BasicExecutionModule.cs @@ -63,14 +63,24 @@ namespace mROA.Implementation.Backend return ExecuteAsync(currentCommand, context, parameter, command, _cancellationRepo, representationModule); - var result = Execute(currentCommand, context, parameter, command); - - if (command.CommandId == -1) + try { - contextRepository.ClearObject(command.ObjectId); - } + var result = Execute(currentCommand, context, parameter, command); + if (command.CommandId == -1) + { + Console.WriteLine("Disposing object"); + contextRepository.ClearObject(command.ObjectId); + } - return result; + return result; + } + catch (Exception e) + { + Console.WriteLine(e); + throw; + } + + } private static ICommandExecution Execute(MethodInfo currentCommand, object context, object? parameter, diff --git a/mROA/Implementation/CallRequest.cs b/mROA/Implementation/CallRequest.cs index 783cce2..1d51e7e 100644 --- a/mROA/Implementation/CallRequest.cs +++ b/mROA/Implementation/CallRequest.cs @@ -24,6 +24,10 @@ namespace mROA.Implementation public Type? ParameterType { get; set; } public object? Parameter { get; set; } + public override string ToString() + { + return $"Call request {{ Id : {Id}, CommandId : {CommandId}, ObjectId : {ObjectId} }}"; + } } public class CancelRequest : ICallRequest @@ -32,5 +36,9 @@ namespace mROA.Implementation public int CommandId { get; set; } = -2; public int ObjectId { get; set; } = -2; public object? Parameter { get; set; } = null; + public override string ToString() + { + return $"Cancel request {{ Id : {Id}, CommandId : {CommandId}, ObjectId : {ObjectId} }}"; + } } } \ No newline at end of file