From 29443925c557e7b3bfabee08097cef505b681151 Mon Sep 17 00:00:00 2001 From: Rod Kay Date: Fri, 23 Aug 2024 12:49:48 +1000 Subject: [PATCH] lace.make_observer.rid: Handle storage_Error locally. --- .../lace/source/events/mixin/lace-make_observer.adb | 8 ++++++++ .../source/events/utility/lace-event-utility.adb | 13 +++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/1-base/lace/source/events/mixin/lace-make_observer.adb b/1-base/lace/source/events/mixin/lace-make_observer.adb index 244b33a..b6a99d5 100644 --- a/1-base/lace/source/events/mixin/lace-make_observer.adb +++ b/1-base/lace/source/events/mixin/lace-make_observer.adb @@ -18,6 +18,7 @@ is end destroy; + ------------ -- Responses -- @@ -32,6 +33,7 @@ is end add; + overriding procedure rid (Self : access Item; the_Response : in Response.view; to_Kind : in Event.Kind; @@ -39,9 +41,14 @@ is is begin Self.Responses.rid (Self, the_Response, to_Kind, from_Subject); + + exception + when storage_Error => + null; -- The observer is dead. end rid; + overriding procedure relay_responseless_Events (Self : in out Item; To : in Observer.view) is @@ -50,6 +57,7 @@ is end relay_responseless_Events; + ------------- -- Operations -- diff --git a/1-base/lace/source/events/utility/lace-event-utility.adb b/1-base/lace/source/events/utility/lace-event-utility.adb index 8f49706..e3853fd 100644 --- a/1-base/lace/source/events/utility/lace-event-utility.adb +++ b/1-base/lace/source/events/utility/lace-event-utility.adb @@ -42,6 +42,7 @@ is end Name_of; + -------------- -- Connections -- @@ -68,14 +69,9 @@ is Subject_Name : in String) is begin - begin - the_Observer.rid (for_Response, - to_Event_Kind, - Subject_Name); - exception - when storage_Error => - null; -- The observer is dead. - end; + the_Observer.rid (for_Response, + to_Event_Kind, + Subject_Name); begin from_Subject.deregister (the_Observer, @@ -88,6 +84,7 @@ is end disconnect; + ---------- -- Logging --