This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch ISIS-3110 in repository https://gitbox.apache.org/repos/asf/isis.git
commit ad83150733b14c5f8270fd7588436c34b9b34d56 Author: Dan Haywood <[email protected]> AuthorDate: Thu Aug 4 10:26:49 2022 +0100 ISIS-3110: removes circular dependency --- .../publish/ObjectLifecyclePublisherDefault.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java index 71489accdb..91a6473f28 100644 --- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java @@ -63,10 +63,14 @@ public class ObjectLifecyclePublisherDefault implements ObjectLifecyclePublisher private final Provider<EntityChangeTracker> entityChangeTrackerProvider; private final Provider<LifecycleCallbackNotifier> lifecycleCallbackNotifierProvider; - private final InteractionService interactionService; + private final Provider<InteractionService> interactionServiceProvider; - EntityChangeTracker entityChangeTracker() { - return interactionService.isInInteraction() ? entityChangeTrackerProvider.get() : EntityChangeTracker.NOOP; + private InteractionService interactionService() { + return interactionServiceProvider.get(); + } + + private EntityChangeTracker entityChangeTracker() { + return interactionService().isInInteraction() ? entityChangeTrackerProvider.get() : EntityChangeTracker.NOOP; } LifecycleCallbackNotifier lifecycleCallbackNotifier() {
