From c8a3c34ca616282e59ebb768e2849f00f7243193 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 25 Feb 2023 12:15:43 +0100 Subject: [PATCH] Continued: - ops, mixed both registries ... --- .../registry/class_SocketRegistryFactory.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php index b527814e..a3b985c4 100644 --- a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php +++ b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php @@ -49,21 +49,26 @@ class SocketRegistryFactory extends BaseFactory { */ public static final function createSocketRegistryInstance () { // Get registry instance - $registryInstance = ObjectRegistry::getRegistry('factory'); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('SOCKET-REGISTRY-FACTORY: CALLED!'); + $objectRegistryInstance = ObjectRegistry::getRegistry('factory'); // Do we have an instance in the registry? - if ($registryInstance->instanceExists('socket_registry')) { + if ($objectRegistryInstance->instanceExists('socket_registry')) { // Then use this instance - $registryInstance = $registryInstance->getInstance('socket_registry'); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('SOCKET-REGISTRY-FACTORY: Getting socket registry instance ...'); + $registryInstance = $objectRegistryInstance->getInstance('socket_registry'); } else { // Get the registry instance + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('SOCKET-REGISTRY-FACTORY: Creating new socket registry instance ...'); $registryInstance = ObjectFactory::createObjectByConfiguredName('socket_registry_class'); // Set the instance in registry for further use - $registryInstance->addInstance('socket_registry', $registryInstance); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('SOCKET-REGISTRY-FACTORY: Adding socket registry instance ...'); + $objectRegistryInstance->addInstance('socket_registry', $registryInstance); } // Return the instance + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('SOCKET-REGISTRY-FACTORY: registryInstance=%s - EXIT!', $registryInstance->__toString())); return $registryInstance; } -- 2.39.2