Continued:

[core.git] / framework / main / classes / factories / client / class_ClientFactory.php

diff --git a/framework/main/classes/factories/client/class_ClientFactory.php b/framework/main/classes/factories/client/class_ClientFactory.php
index 339f076dbbc36cbc433cf1315c58ef98cfc610d7..3b182f8f7135c9cb99d853fc2014744f615dde34 100644 (file)
--- a/framework/main/classes/factories/client/class_ClientFactory.php
+++ b/framework/main/classes/factories/client/class_ClientFactory.php
@@ -55,9 +55,9 @@ class ClientFactory extends BaseFactory {
                $registryKey = strtolower($protocolInstance->getProtocolName()) . '_client';
 
                // Is the key already in registry?
-               if (GenericRegistry::getRegistry()->instanceExists($registryKey)) {
+               if (ObjectRegistry::getRegistry('factory')->instanceExists($registryKey)) {
                        // Then use that instance
-                       $clientInstance = GenericRegistry::getRegistry()->getInstance($registryKey);
+                       $clientInstance = ObjectRegistry::getRegistry('factory')->getInstance($registryKey);
 
                        // Set socket resource
                        $clientInstance->setSocketResource($socketResource);
@@ -66,7 +66,7 @@ class ClientFactory extends BaseFactory {
                        $clientInstance = ObjectFactory::createObjectByConfiguredName($registryKey, array($socketResource));
 
                        // Set it in registry for later re-use
-                       GenericRegistry::getRegistry()->addInstance($registryKey, $clientInstance);
+                       ObjectRegistry::getRegistry('factory')->addInstance($registryKey, $clientInstance);
                }
 
                // Return the prepared instance