Continued:

[hub.git] / application / hub / main / handler / network / class_BaseRawDataHandler.php

diff --git a/application/hub/main/handler/network/class_BaseRawDataHandler.php b/application/hub/main/handler/network/class_BaseRawDataHandler.php
index 05dc6438785abdda11d3a00ef0df011b8f0a0e9d..6bb894438ef3e625f4906ffeb7b9c06e4978fd1d 100644 (file)
--- a/application/hub/main/handler/network/class_BaseRawDataHandler.php
+++ b/application/hub/main/handler/network/class_BaseRawDataHandler.php
@@ -78,10 +78,10 @@ class BaseRawDataHandler extends BaseHandler {
                $this->setErrorCode(self::SOCKET_ERROR_UNKNOWN);
 
                // Init stacker instance for processed raw data
-               $stackerInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_stacker_class');
+               $stackInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_stacker_class');
 
                // Remember this in this package handler
-               $this->setStackerInstance($stackerInstance);
+               $this->setStackInstance($stackInstance);
 
                // Init stacker
                $this->initStack();
@@ -93,7 +93,7 @@ class BaseRawDataHandler extends BaseHandler {
         * @return      void
         */
        protected function initStack () {
-               $this->getStackerInstance()->initStack(self::STACKER_NAME_RAW_DATA);
+               $this->getStackInstance()->initStack(self::STACKER_NAME_RAW_DATA);
        }
 
        /**
@@ -107,7 +107,7 @@ class BaseRawDataHandler extends BaseHandler {
                 * Add the deocoded data and error code to the stacker so other classes
                 * (e.g. NetworkPackage) can "pop" it from the stacker.
                 */
-               $this->getStackerInstance()->pushNamed(self::STACKER_NAME_RAW_DATA, array(
+               $this->getStackInstance()->pushNamed(self::STACKER_NAME_RAW_DATA, array(
                        self::PACKAGE_RAW_DATA   => $rawData,
                        self::PACKAGE_ERROR_CODE => $this->getErrorCode()
                ));
@@ -120,7 +120,7 @@ class BaseRawDataHandler extends BaseHandler {
         */
        public function isRawDataPending () {
                // Does the stacker have some entries (not empty)?
-               $isPending = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_RAW_DATA));
+               $isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_RAW_DATA));
 
                // Return it
                return $isPending;
@@ -133,7 +133,7 @@ class BaseRawDataHandler extends BaseHandler {
         */
        public function getNextRawData () {
                // "Pop" the raw data from the stacker
-               $rawData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_RAW_DATA);
+               $rawData = $this->getStackInstance()->popNamed(self::STACKER_NAME_RAW_DATA);
 
                // And return it
                return $rawData;