Merge pull request #341 from AArnott/dev/andarno/fix340

Fix handling of events declared on the base types of target objects
microsoft · Sep 19, 2019 · 3d3bdd5 · 3d3bdd5
2 parents b94d097 + 588143d
commit 3d3bdd5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/StreamJsonRpc.Tests/TargetObjectEventsTests.cs b/src/StreamJsonRpc.Tests/TargetObjectEventsTests.cs
@@ -24,7 +24,7 @@ public class TargetObjectEventsTests : TestBase
     public TargetObjectEventsTests(ITestOutputHelper logger)
         : base(logger)
     {
-        this.server = new Server();
+        this.server = new ServerDerived();
         this.client = new Client();
 
         var streams = FullDuplexStream.CreateStreams();
@@ -268,6 +268,10 @@ public void TriggerGenericEvent(CustomEventArgs args)
         protected virtual void OnServerEventWithCustomGenericDelegateAndArgs(MessageEventArgs<string> args) => this.ServerEventWithCustomGenericDelegateAndArgs?.Invoke(this, args);
     }
 
+    private class ServerDerived : Server
+    {
+    }
+
     private class ServerWithIncompatibleEvents
     {
         public delegate int MyDelegate(double d);

diff --git a/src/StreamJsonRpc/JsonRpc.cs b/src/StreamJsonRpc/JsonRpc.cs
@@ -670,21 +670,24 @@ public void AddLocalRpcTarget(object target, JsonRpcTargetOptions options)
 
                 if (options.NotifyClientOfEvents)
                 {
-                    foreach (var evt in target.GetType().GetTypeInfo().DeclaredEvents)
+                    for (TypeInfo t = target.GetType().GetTypeInfo(); t != null && t != typeof(object).GetTypeInfo(); t = t.BaseType?.GetTypeInfo())
                     {
-                        if (evt.AddMethod.IsPublic && !evt.AddMethod.IsStatic)
+                        foreach (var evt in t.DeclaredEvents)
                         {
-                            if (this.eventReceivers == null)
+                            if (evt.AddMethod.IsPublic && !evt.AddMethod.IsStatic)
                             {
-                                this.eventReceivers = new List<EventReceiver>();
-                            }
+                                if (this.eventReceivers == null)
+                                {
+                                    this.eventReceivers = new List<EventReceiver>();
+                                }
 
-                            if (this.TraceSource.Switch.ShouldTrace(TraceEventType.Information))
-                            {
-                                this.TraceSource.TraceEvent(TraceEventType.Information, (int)TraceEvents.LocalEventListenerAdded, "Listening for events from {0}.{1} to raise notification.", target.GetType().FullName, evt.Name);
-                            }
+                                if (this.TraceSource.Switch.ShouldTrace(TraceEventType.Information))
+                                {
+                                    this.TraceSource.TraceEvent(TraceEventType.Information, (int)TraceEvents.LocalEventListenerAdded, "Listening for events from {0}.{1} to raise notification.", target.GetType().FullName, evt.Name);
+                                }
 
-                            this.eventReceivers.Add(new EventReceiver(this, target, evt, options));
+                                this.eventReceivers.Add(new EventReceiver(this, target, evt, options));
+                            }
                         }
                     }
                 }