Updated copyright year as this software has been changed in this year.

[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 fe8a5af72307e070953850d664217698b0bb99d2..584c8daff9b4edce7c279a1d098db20e919f308b 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
@@ -2,11 +2,11 @@
 /**
  * A NodeMessageSelfConnect handler
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,17 +59,17 @@ class NodeMessageSelfConnectHandler extends BaseMessageHandler implements Handle
                // 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())) {
                        // Both are equal
-                       self::createDebugInstance(__CLASS__)->debugOutput('SELF-CONNECT: Have connected to myself, both node and session id 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 = Registry::getRegistry()->getInstance('node');
+                       $nodeInstance = NodeObjectFactory::createNodeInstance();
 
                        // ... and change state
                        $nodeInstance->getStateInstance()->nodeHasSelfConnected();
                } else {
                        // Something really horrible happened
                        // @TODO Throw an exception here instead of dying
-                       $this->debugInstance(__METHOD__ . ': ids mismatching! messageData=' . print_r($messageData, true));
+                       $this->debugInstance(__METHOD__ . ': ids mismatching! messageData=' . print_r($messageData, TRUE));
                }
        }