Added check for NULL + renamed XML nodes.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/hub/main/template/bootstrap/class_XmlDhtBootstrapTemplateEngine.php b/application/hub/main/template/bootstrap/class_XmlDhtBootstrapTemplateEngine.php
index 7c6810df3a9bc5896f9a0c2ab54a097ad89ce269..ffe95da9d515d5e2b299ed705c6764d5e0327b26 100644 (file)
--- a/application/hub/main/template/bootstrap/class_XmlDhtBootstrapTemplateEngine.php
+++ b/application/hub/main/template/bootstrap/class_XmlDhtBootstrapTemplateEngine.php
@@ -26,12 +26,13 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com
        /**
         * Some XML nodes must be available for later data extraction
         */
-       const DHT_BOOTSTRAP_DATA_SESSION_ID  = 'session-id';
-       const DHT_BOOTSTRAP_DATA_NODE_STATUS = 'node-status';
-       const DHT_BOOTSTRAP_DATA_NODE_MODE   = 'node-mode';
-       const DHT_BOOTSTRAP_DATA_EXTERNAL_IP = 'external-ip';
-       const DHT_BOOTSTRAP_DATA_INTERNAL_IP = 'internal-ip';
-       const DHT_BOOTSTRAP_DATA_LISTEN_PORT = 'listen-port';
+       const DHT_BOOTSTRAP_DATA_BOOTSTRAP_DATA = 'dht-bootstrap-data';
+       const DHT_BOOTSTRAP_DATA_SESSION_ID     = 'session-id';
+       const DHT_BOOTSTRAP_DATA_NODE_STATUS    = 'node-status';
+       const DHT_BOOTSTRAP_DATA_NODE_MODE      = 'node-mode';
+       const DHT_BOOTSTRAP_DATA_EXTERNAL_IP    = 'external-ip';
+       const DHT_BOOTSTRAP_DATA_INTERNAL_IP    = 'internal-ip';
+       const DHT_BOOTSTRAP_DATA_LISTEN_PORT    = 'listen-port';
 
        /**
         * Protected constructor
@@ -44,7 +45,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com
 
                // Init array
                $this->subNodes = array(
-                       'bootstrap-data',
+                       self::DHT_BOOTSTRAP_DATA_BOOTSTRAP_DATA,
                        'listener',
                        self::DHT_BOOTSTRAP_DATA_NODE_STATUS,
                        self::DHT_BOOTSTRAP_DATA_NODE_MODE,
@@ -118,7 +119,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startBootstrap () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('dht_bootstrap', 'bootstrap');
+               $this->getStackerInstance()->pushNamed('dht_bootstrap', 'dht-bootstrap');
        }
 
        /**
@@ -128,7 +129,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startBootstrapData () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('dht_bootstrap', 'bootstrap-data');
+               $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_BOOTSTRAP_DATA);
        }
 
        /**

diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php
index a06023f1f21379ef9f61ce9c1c486f9e9183ba3f..0f9ed2250a0017cd8c8a93c92f28dcc5a886af54 100644 (file)
--- a/application/hub/main/template/class_BaseXmlTemplateEngine.php
+++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php
@@ -211,6 +211,12 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                // Read the variable
                $value = parent::readVariable($key, 'general');
 
+               // Is this null?
+               if (is_null($value)) {
+                       // Bah, needs fixing.
+                       $this->debugInstance('key=' . $key . ' returns NULL');
+               } // END - if
+
                // Return value
                return $value;
        }

diff --git a/application/hub/templates/xml/dht_bootstrap/bootstrap.xml b/application/hub/templates/xml/dht_bootstrap/bootstrap.xml
index 3e6c48e6e3cb8e3effad7ad275080b344d564fff..e3ca8e6b90b807dccb24e5db8170c0d84f3799b7 100644 (file)
--- a/application/hub/templates/xml/dht_bootstrap/bootstrap.xml
+++ b/application/hub/templates/xml/dht_bootstrap/bootstrap.xml
@@ -21,7 +21,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
-<bootstrap>
+<dht-bootstrap>
        <!--
        The data in this message is similar to that in announcement, except that an
        announcement is sent to boot, master and list nodes but this to "all" nodes
@@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        type as much as you want here, as all will be removed by the compaction
        step.
        //-->
-       <bootstrap-data>
+       <dht-bootstrap-data>
                <!-- Status of this node, see node_status.xml for details. //-->
                <node-status>{?node_status?}</node-status>
                <!-- Node mode: regular, master, list, boot again //-->
@@ -49,5 +49,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                        <!-- Listener ports for both connections //-->
                        <listen-port>{?node_listen_port?}</listen-port>
                </listener>
-       </bootstrap-data>
-</bootstrap>
+       </dht-bootstrap-data>
+</dht-bootstrap>