Used exit() instead of die()

[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 994544e1b4a34c69cda8a4147dfbff5ee23e468f..3c377d145716ef02002f58c29acddd7f37aed2cb 100644 (file)
--- a/application/hub/main/package/assembler/class_PackageAssembler.php
+++ b/application/hub/main/package/assembler/class_PackageAssembler.php
@@ -52,7 +52,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable
                $assemblerInstance->setPackageInstance($packageInstance);
 
                // Create an instance of a raw data input stream
-               $streamInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_input_stream_class', array($packageInstance));
+               $streamInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_input_stream_class');
 
                // And set it
                $assemblerInstance->setInputStreamInstance($streamInstance);
@@ -85,7 +85,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable
         */
        private function isPackageContentCompleted (array $packageContent) {
                // Check both
-               $isCompleted = ((substr($packageContent[BaseRawDataHandler::PACKAGE_RAW_DATA], 0, 5) == '[[S]]') && (substr($packageContent[BaseRawDataHandler::PACKAGE_RAW_DATA], -5, 5) == '[[E]]'));
+               $isCompleted = $this->ifStartEndMarkerSet($packageContent[BaseRawDataHandler::PACKAGE_RAW_DATA]);
 
                // Return status
                return $isCompleted;