Merge pull request #16336 from tinchodias/SpeedUpEmptyAnnouncer

Announcer: Return early if there isn't any subscriber
pharo-project · Apr 26, 2024 · 707ebfb · 707ebfb
2 parents 1468266 + f95ea61
commit 707ebfb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/Announcements-Core/Announcer.class.st b/src/Announcements-Core/Announcer.class.st
@@ -27,16 +27,22 @@ Class {
 Announcer >> announce: anAnnouncement [
 
 	^ self isSuspended
-		  ifFalse: [
-			  | announcement |
-			  announcement := anAnnouncement asAnnouncement.
-
-			  "If the user required to prevent the current announcement, we stop here."
-			  (self preventedAnnouncements handlesAnnouncement: announcement) ifTrue: [ ^ self ].
-
-			  registry ifNotNil: [ registry deliver: announcement ].
-			  announcement ]
-		  ifTrue: [ storedAnnouncements ifNotNil: [ storedAnnouncements add: anAnnouncement ] ]
+		ifFalse: [
+			| announcement |
+			announcement := anAnnouncement asAnnouncement.
+
+			"Stop if there isn't any subscriber"
+			registry isEmpty ifTrue: [ ^ announcement ].
+
+			"If the user required to prevent the current announcement, we stop here."
+			(self preventedAnnouncements handlesAnnouncement: announcement)
+				ifTrue: [ ^ announcement ].
+
+			registry deliver: announcement.
+			announcement ]
+		ifTrue: [
+			storedAnnouncements ifNotNil: [
+				storedAnnouncements add: anAnnouncement ] ]
 ]
 
 { #category : 'private' }

diff --git a/src/Announcements-Core/SubscriptionRegistry.class.st b/src/Announcements-Core/SubscriptionRegistry.class.st
@@ -73,6 +73,12 @@ SubscriptionRegistry >> initialize [
 	self reset
 ]
 
+{ #category : 'testing' }
+SubscriptionRegistry >> isEmpty [
+
+	^ subscriptions isEmpty
+]
+
 { #category : 'accessing' }
 SubscriptionRegistry >> numberOfSubscriptions [