Fixed a lot broken stuff:

[hub.git] / application / hub / main / handler / message-types / self-connect / class_NodeMessageSelfConnectHandler.php

diff --git a/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php b/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php
index 584c8daff9b4edce7c279a1d098db20e919f308b..e1ac210a247e0863b7b87b8e3f46c6a33a6dc8c1 100644 (file)
--- a/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php
+++ b/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php
@@ -56,14 +56,14 @@ class NodeMessageSelfConnectHandler extends BaseMessageHandler implements Handle
         * @return      void
         */
        public function handleMessageData (array $messageData, Receivable $packageInstance) {
+               // Get node instance
+               $nodeInstance = NodeObjectFactory::createNodeInstance();
+
                // Are node id and session id the same?
-               if (($messageData[XmlSelfConnectTemplateEngine::SELF_CONNECT_DATA_NODE_ID] == $this->getNodeId()) && ($messageData[XmlSelfConnectTemplateEngine::SELF_CONNECT_DATA_SESSION_ID] == $this->getSessionId())) {
+               if (($messageData[XmlSelfConnectTemplateEngine::SELF_CONNECT_DATA_NODE_ID] == $nodeInstance->getNodeId()) && ($messageData[XmlSelfConnectTemplateEngine::SELF_CONNECT_DATA_SESSION_ID] == $nodeInstance->getSessionId())) {
                        // Both are equal
                        self::createDebugInstance(__CLASS__)->debugOutput('SELF-CONNECT[' . __METHOD__ . ':' . __LINE__ . ']: Have connected to myself, both node and session id are equal!');
 
-                       // Get node instance ...
-                       $nodeInstance = NodeObjectFactory::createNodeInstance();
-
                        // ... and change state
                        $nodeInstance->getStateInstance()->nodeHasSelfConnected();
                } else {