Wrong order

[core.git] / inc / classes / main / factories / registry / class_SocketRegistryFactory.php

diff --git a/inc/classes/main/factories/registry/class_SocketRegistryFactory.php b/inc/classes/main/factories/registry/class_SocketRegistryFactory.php
index 9a7163082c27872ba982059b9fa4f9eae0dbaa08..a4b25b99f14e312ee31b32c14fe990755a0c6790 100644 (file)
--- a/inc/classes/main/factories/registry/class_SocketRegistryFactory.php
+++ b/inc/classes/main/factories/registry/class_SocketRegistryFactory.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Hub Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -22,38 +22,43 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class SocketRegistryFactory extends ObjectFactory {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+       }
+
        /**
         * Returns a singleton socket registry instance. If an instance is found in
         * the registry it will be returned, else a new instance is created and
         * stored in the same registry entry.
         *
-        * @return      $packageInstance        A socket registry instance
+        * @return      $registryInstance       A socket registry instance
         */
        public static final function createSocketRegistryInstance () {
+               // Get registry instance
+               $registryInstance = Registry::getRegistry();
+
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists('socket_registry')) {
+               if ($registryInstance->instanceExists('socket_registry')) {
                        // Then use this instance
-                       $packageInstance = Registry::getRegistry()->getInstance('socket_registry');
+                       $registryInstance = $registryInstance->getInstance('socket_registry');
                } else {
                        // Get the registry instance
-                       $packageInstance = ObjectFactory::createObjectByConfiguredName('socket_registry_class');
+                       $registryInstance = ObjectFactory::createObjectByConfiguredName('socket_registry_class');
 
                        // Set the instance in registry for further use
-                       Registry::getRegistry()->addInstance('socket_registry', $packageInstance);
+                       $registryInstance->addInstance('socket_registry', $registryInstance);
                }
 
                // Return the instance
-               return $packageInstance;
-       }
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
+               return $registryInstance;
        }
 }
+
+// [EOF]
 ?>