Continued:

[hub.git] / application / hub / main / package / assembler / class_PackageAssembler.php

diff --git a/application/hub/main/package/assembler/class_PackageAssembler.php b/application/hub/main/package/assembler/class_PackageAssembler.php
index cf862aba3a5ec3500d2a941a78355187ec673c41..855cf57f0a145d7cc32cddf6894fe796fc2b1988 100644 (file)
--- a/application/hub/main/package/assembler/class_PackageAssembler.php
+++ b/application/hub/main/package/assembler/class_PackageAssembler.php
@@ -74,13 +74,13 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable,
                $assemblerInstance->setHandlerInstance($handlerInstance);
 
                // Get stacker instance
-               $stackerInstance = ObjectFactory::createObjectByConfiguredName('multiple_message_stacker_class');
+               $stackInstance = ObjectFactory::createObjectByConfiguredName('multiple_message_stacker_class');
 
                // Initialize the only one stack
-               $stackerInstance->initStack(self::STACKER_NAME_MULTIPLE_MESSAGE);
+               $stackInstance->initStack(self::STACKER_NAME_MULTIPLE_MESSAGE);
 
                // And add it
-               $assemblerInstance->setStackerInstance($stackerInstance);
+               $assemblerInstance->setStackInstance($stackInstance);
 
                // Return the prepared instance
                return $assemblerInstance;
@@ -93,7 +93,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable,
         */
        private function ifInputBufferIsEmpty () {
                // Check it
-               $isInputBufferEmpty = $this->getPackageInstance()->getStackerInstance()->isStackEmpty(NetworkPackage::STACKER_NAME_DECODED_HANDLED);
+               $isInputBufferEmpty = $this->getPackageInstance()->getStackInstance()->isStackEmpty(NetworkPackage::STACKER_NAME_DECODED_HANDLED);
 
                // Debug message
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('PACKAGE-ASSEMBLER[' . __METHOD__ . ':' . __LINE__ . ']: isInputBufferEmpty=' . intval($isInputBufferEmpty));
@@ -201,7 +201,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable,
         */
        public function ifMultipleMessagesPending () {
                // Determine it
-               $isPending = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_MULTIPLE_MESSAGE));
+               $isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_MULTIPLE_MESSAGE));
 
                // Return it
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('PACKAGE-ASSEMBLER[' . __METHOD__ . ':' . __LINE__ . ': isPending=' . intval($isPending));
@@ -236,7 +236,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable,
                                $message = BaseRawDataHandler::STREAM_START_MARKER . $message;
 
                                // Push it on stack
-                               $this->getStackerInstance()->pushNamed(self::STACKER_NAME_MULTIPLE_MESSAGE, $message);
+                               $this->getStackInstance()->pushNamed(self::STACKER_NAME_MULTIPLE_MESSAGE, $message);
                        } // END - foreach
 
                        // Clear pending data
@@ -290,7 +290,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable,
                assert($this->isPendingDataEmpty());
 
                // "Pop" next entry from stack and set it as new pending data
-               $this->pendingData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_MULTIPLE_MESSAGE);
+               $this->pendingData = $this->getStackInstance()->popNamed(self::STACKER_NAME_MULTIPLE_MESSAGE);
 
                // And handle it
                $this->handlePendingData();