Debug message was added at wrong position

diff --git a/application/hub/exceptions.php b/application/hub/exceptions.php
index dbce802e7e1e55f0257982e0b010006d50819063..ed80b25d53bf563d2c7e5fd9d62d99abb075c727 100644 (file)
--- a/application/hub/exceptions.php
+++ b/application/hub/exceptions.php
@@ -87,14 +87,14 @@ Backtrace:
                // Invalid exception instance detected! Do *only* throw exceptions that
                // extends our own exception 'FrameworkException' to get such nice
                // outputs like above.
-               print("exceptionInstance is invalid! Please inform the core developer team.\n");
+               print('exceptionInstance[]=' . gettype($exceptionInstance) . ' is invalid! Please inform the core developer team.');
        }
 }
 
 // Error handler
 function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) {
        // Construct the message
-       $message = sprintf("File: %s, Line: %s, Code: %s, Message: %s",
+       $message = sprintf('File: %s, Line: %s, Code: %s, Message: %s',
                basename($errfile),
                $errline,
                $errno,
@@ -113,7 +113,7 @@ function __assertHandler ($file, $line, $code) {
        } // END - if
 
        // Create message
-       $message = sprintf("File: %s, Line: %s, Code: %s",
+       $message = sprintf('File: %s, Line: %s, Code: %s',
                basename($file),
                $line,
                $code

diff --git a/application/hub/main/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php b/application/hub/main/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php
index fe39ae8491a05d2adeff80d2f06caf70520282c2..2eb3c37ef224448ae608cc114d0d1e9e4dff99ef 100644 (file)
--- a/application/hub/main/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php
+++ b/application/hub/main/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php
@@ -130,9 +130,6 @@ class NodeMessageRequestNodeListHandler extends BaseMessageHandler implements Ha
                        $this->getConfigInstance()->setConfigEntry($targetKey, $this->getConfigInstance()->getConfigEntry($sourceKey));
                } // END - foreach
 
-               // Debug message
-               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REQUEST-HANDLER[' . __LINE__ . ']: Got a node list of ' . count($nodeList) . ' entry/-ies back.');
-
                // Query local DHT for nodes except given session id
                $nodeList = $this->getDhtInstance()->queryLocalNodeListExceptByMessageData(
                        $messageData,
@@ -142,6 +139,9 @@ class NodeMessageRequestNodeListHandler extends BaseMessageHandler implements Ha
                        BaseHubNode::OBJECT_LIST_SEPARATOR
                );
 
+               // Debug message
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REQUEST-HANDLER[' . __LINE__ . ']: Got a node list of ' . count($nodeList) . ' entry/-ies back.');
+
                // Set it serialized in configuration (temporarily)
                $this->getConfigInstance()->setConfigEntry('node_list', base64_encode(serialize($nodeList)));