X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Fhandler%2Fclass_BaseDataHandler.php;h=a8245372702ef546ed4186bc9703253687653a3a;hb=ea369fbf3b5ab38fa5616561502015855e024b53;hp=6e80fd2ac65d5ea270314c57cfaf9ebcb86ab475;hpb=dfa91e1b5e2d0a3f68c133b3bec4fcb34e5e9c96;p=hub.git

diff --git a/application/hub/main/handler/class_BaseDataHandler.php b/application/hub/main/handler/class_BaseDataHandler.php
index 6e80fd2ac..a82453727 100644
--- a/application/hub/main/handler/class_BaseDataHandler.php
+++ b/application/hub/main/handler/class_BaseDataHandler.php
@@ -4,7 +4,7 @@
  *
  * @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 - 2014 Hub Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -59,7 +59,7 @@ abstract class BaseDataHandler extends BaseHandler {
 		parent::__construct($className);
 
 		// Get a DHT instance
-		$dhtInstance = DhtObjectFactory::createDhtObjectInstance('node');
+		$dhtInstance = DhtObjectFactory::createDhtInstance('node');
 
 		// Set it here
 		$this->setDhtInstance($dhtInstance);
@@ -102,13 +102,13 @@ abstract class BaseDataHandler extends BaseHandler {
 	 */
 	protected function prepareAnswerMessage (array $messageData, Deliverable $packageInstance) {
 		// Debug message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . $this->__toString() . ']: Going to send an answer message ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Going to send an answer message for ' . $this->getHandlerName() . ' ...');
 
 		// Get a helper instance based on this handler's name
 		$helperInstance = ObjectFactory::createObjectByConfiguredName('node_answer_' . $this->getHandlerName() . '_helper_class', array($messageData));
 
 		// Get node instance
-		$nodeInstance = Registry::getRegistry()->getInstance('node');
+		$nodeInstance = NodeObjectFactory::createNodeInstance();
 
 		// Load descriptor XML
 		$helperInstance->loadDescriptorXml($nodeInstance);
@@ -131,7 +131,7 @@ abstract class BaseDataHandler extends BaseHandler {
 		$this->removeMessageConfigurationData($messageData);
 
 		// Debug message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . $this->__toString() . ']: Answer message has been prepared.');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Answer message has been prepared.');
 	}
 
 	/**
@@ -143,13 +143,13 @@ abstract class BaseDataHandler extends BaseHandler {
 	 */
 	protected function prepareNextMessage (array $messageData, Deliverable $packageInstance) {
 		// Debug message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . $this->__toString() . ']: Going to send next message ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Going to send next message ...');
 
 		// Get a helper instance based on this handler's name
 		$helperInstance = ObjectFactory::createObjectByConfiguredName('node_next_' . $this->getHandlerName() . '_helper_class', array($messageData));
 
 		// Get node instance
-		$nodeInstance = Registry::getRegistry()->getInstance('node');
+		$nodeInstance = NodeObjectFactory::createNodeInstance();
 
 		// Load descriptor XML
 		$helperInstance->loadDescriptorXml($nodeInstance);
@@ -172,7 +172,7 @@ abstract class BaseDataHandler extends BaseHandler {
 		$this->removeMessageConfigurationData($messageData);
 
 		// Debug message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . $this->__toString() . ']: Next message has been prepared.');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Next message has been prepared.');
 	}
 
 	/**