]> git.mxchange.org Git - hub.git/commitdiff
Continued:
authorRoland Häder <roland@mxchange.org>
Sat, 22 Aug 2020 08:50:43 +0000 (10:50 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 22 Aug 2020 08:50:43 +0000 (10:50 +0200)
- added packageDataInstance property, still some fields are missing
- added very noisy debug lines

Signed-off-by: Roland Häder <roland@mxchange.org>
application/hub/classes/container/socket/class_SocketContainer.php
application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php
application/hub/classes/database/frontend/states/class_PeerStateLookupDatabaseWrapper.php
application/hub/classes/factories/socket/class_SocketFactory.php
application/hub/classes/listener/class_BaseListener.php
application/hub/classes/package/deliverable/class_PackageData.php
application/hub/classes/package/fragmenter/class_PackageFragmenter.php
application/hub/classes/recipient/dht/class_DhtRecipient.php
application/hub/classes/recipient/direct/class_DirectRecipient.php
application/hub/classes/recipient/self/class_SelfRecipient.php
application/hub/classes/recipient/upper/class_UpperRecipient.php

index 266af0e0e7b4c9bf98a3d3b672909eeec58f85b9..170bcb0201aebe840543666ca44f86e9a7df0c3d 100644 (file)
@@ -71,6 +71,11 @@ class SocketContainer extends BaseHubContainer implements StorableSocket, Visita
         */
        private $socketSelectTimeout = 0;
 
+       /**
+        * Package data instance
+        */
+       private $packageDataInstance = NULL;
+
        /**
         * Protected constructor
         *
@@ -128,6 +133,27 @@ class SocketContainer extends BaseHubContainer implements StorableSocket, Visita
                return $socketInstance;
        }
 
+       /**
+        * Setter for package data instance
+        *
+        * @param       $packageDataInstance    An instance of a DeliverablePackage class
+        * @return      void
+        */
+       public function setPackageDataInstance (DeliverablePackage $packageDataInstance) {
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-SOCKET: Setting packageDataInstance=%s', strtoupper($this->getSocketProtocol()), $packageDataInstance));
+               $this->packageDataInstance = $packageDataInstance;
+       }
+
+       /**
+        * Getter for package data instance
+        *
+        * @return      $packageDataInstance    An instance of a DeliverablePackage class
+        */
+       public function getPackageDataInstance () {
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-SOCKET: Getting packageDataInstance=%s', strtoupper($this->getSocketProtocol()), $this->packageDataInstance));
+               return $this->packageDataInstance;
+       }
+
        /**
         * Checks whether the given Universal Node Locator matches with the one from package data
         *
index 8322f9ac7917ce8cd6d496e894eb4c99acf1639a..1248ffa62108673c58e45675294dedcd77889e22 100644 (file)
@@ -613,8 +613,8 @@ class NodeDistributedHashTableDatabaseWrapper extends BaseHubDatabaseWrapper imp
        /**
         * Find recipients for given package data and exclude the sender
         *
-        * @param       $packageData    An instance of a DeliverablePackage class
-        * @return      $recipients             An indexed array with DHT recipients
+        * @param       $packageInstance        An instance of a DeliverablePackage class
+        * @return      $recipients                     An indexed array with DHT recipients
         */
        public function getResultFromExcludedSender (DeliverablePackage $packageInstance) {
                // Debug message
index 47852d431018ddb616a0984bf39e60a30a1e3a54..32acb0e421dbab70172a8322a035cb03f020c30a 100644 (file)
@@ -84,7 +84,7 @@ class PeerStateLookupDatabaseWrapper extends BaseHubDatabaseWrapper implements L
        /**
         * "Getter" for a LocalSearchCriteria from given package data's sender
         *
-        * @param       $packageData            Valid raw package data array
+        * @param       $packageInstance        An instance of a DeliverablePackage class
         * @return      $searchInstance         An instance of a LocalSearchCriteria class
         */
        private function getSenderSearchInstanceFromPackageInstance (DeliverablePackage $packageInstance) {
@@ -103,16 +103,16 @@ class PeerStateLookupDatabaseWrapper extends BaseHubDatabaseWrapper implements L
        /**
         * Checks whether given 'sender' is a new peer
         *
-        * @param       $packageData            An instance of a DeliverablePackage class
+        * @param       $packageInstance        An instance of a DeliverablePackage class
         * @param       $dataSetInstance        An optional instance of a StoreableCriteria class
         * @return      $isNewPeer                      Whether 'sender' is a new peer to this peer
         */
        public function isSenderNewPeer (DeliverablePackage $packageInstance, StoreableCriteria $dataSetInstance = NULL) {
                // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('PEER-STATE-DATABASE-WRAPPER: packageData()=' . count($packageData) . ' - CALLED!');
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('PEER-STATE-DATABASE-WRAPPER: packageInstance=' . $packageInstance . ' - CALLED!');
 
                // Get a search criteria instance from package data
-               $searchInstance = $this->getSenderSearchInstanceFromPackageInstance($packageData);
+               $searchInstance = $this->getSenderSearchInstanceFromPackageInstance($packageInstance);
 
                // Is the dataset instance set?
                if ($dataSetInstance instanceof StoreableCriteria) {
@@ -135,16 +135,16 @@ class PeerStateLookupDatabaseWrapper extends BaseHubDatabaseWrapper implements L
        /**
         * Registers a new peer with given package data. We use the session id from it.
         *
-        * @param       $packageData            An instance of a DeliverablePackage class
+        * @param       $packageInstance        An instance of a DeliverablePackage class
         * @param       $socketResource         An instance of a StorableSocket class
         * @return      void
         * @throws      PeerAlreadyRegisteredException  If a peer is already registered
         */
        public function registerPeerByPackageData (DeliverablePackage $packageInstance, StorableSocket $socketInstance) {
                // Make sure only new peers can be registered with package data
-               if (!$this->isSenderNewPeer($packageData)) {
+               if (!$this->isSenderNewPeer($packageInstance)) {
                        // Throw an exception because this should normally not happen
-                       throw new PeerAlreadyRegisteredException(array($this, $packageData), self::EXCEPTION_PEER_ALREADY_REGISTERED);
+                       throw new PeerAlreadyRegisteredException(array($this, $packageInstance), self::EXCEPTION_PEER_ALREADY_REGISTERED);
                } // END - if
 
                // Generate a dataset instance
@@ -181,8 +181,8 @@ class PeerStateLookupDatabaseWrapper extends BaseHubDatabaseWrapper implements L
        /**
         * Registers the given peer state and An instance of a DeliverablePackage class
         *
-        * @param       $stateInstance  A PeerStateable class instance
-        * @param       $packageData    An instance of a DeliverablePackage class
+        * @param       $stateInstance          A PeerStateable class instance
+        * @param       $packageInstance        An instance of a DeliverablePackage class
         * @return      void
         * @throws      PeerAlreadyRegisteredException  If a peer is already registered
         * @todo        Unfinished area
@@ -209,7 +209,7 @@ class PeerStateLookupDatabaseWrapper extends BaseHubDatabaseWrapper implements L
                $dataSetInstance->addCriteria(self::DB_COLUMN_PEER_PORT, $senderData[1]);
 
                // Is this a new peer?
-               if ($this->isSenderNewPeer($packageData, $dataSetInstance)) {
+               if ($this->isSenderNewPeer($packageInstance, $dataSetInstance)) {
                        // "Insert" the data set
                        $this->queryInsertDataSet($dataSetInstance, array(self::DB_COLUMN_PEER_SESSION_ID => TRUE));
                } else {
@@ -236,16 +236,16 @@ class PeerStateLookupDatabaseWrapper extends BaseHubDatabaseWrapper implements L
         * Checks whether a given peer state (in helper instance) is same as stored
         * in database compared with the one from $helperInstance.
         *
-        * @param       $helperInstance                 An instance of a ConnectionHelper class
-        * @param       $packageData                    An instance of a DeliverablePackage class
-        * @return      $isSamePeerState                Whether the peer's state is the same
+        * @param       $helperInstance         An instance of a ConnectionHelper class
+        * @param       $packageInstance        An instance of a DeliverablePackage class
+        * @return      $isSamePeerState        Whether the peer's state is the same
         */
        public function isSamePeerState (ConnectionHelper $helperInstance, DeliverablePackage $packageInstance) {
                // Debug message
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('PEER-STATE-DATABASE-WRAPPER: State ' . $helperInstance->getPrintableState() . ' needs to be checked it has changed ...');
 
                // Now get the search instance from given package data
-               $searchInstance = $this->getSenderSearchInstanceFromPackageInstance($packageData);
+               $searchInstance = $this->getSenderSearchInstanceFromPackageInstance($packageInstance);
 
                // With this search instance query the database for the peer and get a result instance
                $resultInstance = $this->doSelectByCriteria($searchInstance);
index 46f99b17f34997944466f77a85a4fdedb634d420..e33598ae4a1ce95ecfa02da1a54195ce646a8950 100644 (file)
@@ -135,7 +135,11 @@ class SocketFactory extends ObjectFactory {
                $socketResource = socket_create(AF_UNIX, SOCK_STREAM, 0);
 
                // Get container from it
-               $socketInstance = self::createObjectByConfiguredName('socket_container_class', array($socketResource, StorableSocket::SOCKET_PROTOCOL_FILE, $packageInstance));
+               $socketInstance = self::createObjectByConfiguredName('socket_container_class', array(
+                       $socketResource,
+                       StorableSocket::SOCKET_PROTOCOL_FILE,
+                       $packageInstance,
+               ));
 
                // Debug message
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('SOCKET-FACTORY: socketInstance[]=%s', gettype($socketInstance)));
@@ -274,21 +278,24 @@ class SocketFactory extends ObjectFactory {
                // Create a streaming socket, of type TCP/IP
                $socketResource = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 
-               // Init fake package data with address/port from listener
-               $packageData = array(
-                       StorableSocket::SOCKET_ARRAY_INDEX_ADDRESS => $listenerInstance->getListenAddress(),
-                       StorableSocket::SOCKET_ARRAY_INDEX_PORT    => $listenerInstance->getListenPort(),
-                       StorableSocket::SOCKET_ARRAY_INDEX_TYPE    => StorableSocket::CONNECTION_TYPE_SERVER,
-               );
+               // Init fake "package" instance, the SocketContainer class requires this
+               $packageInstance = PackageDataFactory::createPackageDataInstance();
 
                // Create socket instance
                $socketInstance = self::createObjectByConfiguredName('socket_container_class', array(
                        $socketResource,
                        StorableSocket::SOCKET_PROTOCOL_TCP,
-                       $packageData,
-                       NULL
+                       $packageInstance,
                ));
 
+               // Set listener instance and type
+               $socketInstance->setListenerInstance($listenerInstance);
+               $socketInstance->setSocketType(StorableSocket::CONNECTION_TYPE_SERVER);
+               /*
+               StorableSocket::SOCKET_ARRAY_INDEX_ADDRESS => $listenerInstance->getListenAddress(),
+               StorableSocket::SOCKET_ARRAY_INDEX_PORT    => $listenerInstance->getListenPort(),
+               */
+
                // Is the socket resource valid?
                if (!$socketInstance->isValidSocket()) {
                        // Something bad happened
@@ -354,15 +361,23 @@ class SocketFactory extends ObjectFactory {
                // Create a streaming socket, of type UDP
                $socketResource = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
 
-               // Init fake package data with address/port from listener
-               $packageData = array(
-                       StorableSocket::SOCKET_ARRAY_INDEX_ADDRESS => $listenerInstance->getListenAddress(),
-                       StorableSocket::SOCKET_ARRAY_INDEX_PORT    => $listenerInstance->getListenPort(),
-                       StorableSocket::SOCKET_ARRAY_INDEX_TYPE    => StorableSocket::CONNECTION_TYPE_SERVER,
-               );
+               // Init fake package instance
+               $packageInstance = PackageDataFactory::createPackageDataInstance();
 
                // Create socket instance
-               $socketInstance = self::createObjectByConfiguredName('socket_container_class', array($socketResource, StorableSocket::SOCKET_PROTOCOL_UDP, $packageData, NULL));
+               $socketInstance = self::createObjectByConfiguredName('socket_container_class', array(
+                       $socketResource,
+                       StorableSocket::SOCKET_PROTOCOL_UDP,
+                       $packageInstance,
+               ));
+
+               // Set listener instance and socket type
+               $socketInstance->setListenerInstance($listenerInstance);
+               $socketInstance->setSocketType(StorableSocket::CONNECTION_TYPE_SERVER);
+               /*
+               StorableSocket::SOCKET_ARRAY_INDEX_ADDRESS => $listenerInstance->getListenAddress(),
+               StorableSocket::SOCKET_ARRAY_INDEX_PORT    => $listenerInstance->getListenPort(),
+               */
 
                // Is the socket resource valid?
                if (!$socketInstance->isValidSocket()) {
index da6171ce0472122e2a9810e199a98f9a30358262..6e428ebd4e9a7ca8d84cf38ff5bf22b2ecc489b2 100644 (file)
@@ -402,14 +402,11 @@ abstract class BaseListener extends BaseHubSystem implements Visitable {
                // Debugging:
                //* DEBUG-DIE: */ $infoInstance->debugInstance();
 
-               // Create a faked package data instance
-               $packageInstance = PackageDataFactory::createPackageDataInstance();
-
                // Set all required data
-               $packageInstance->setSenderAddres($peerAddress . $peerSuffix);
-               $packageInstance->setSenderPort($peerPort);
-               $packageInstance->setRecipient($nodeInstance->getSessionId());
-               $packageInstance->setStatus(NetworkPackageHandler::PACKAGE_STATUS_FAKED);
+               $socketInstance->setSenderAddres($peerAddress . $peerSuffix);
+               $socketInstance->setSenderPort($peerPort);
+               $socketInstance->setRecipient($nodeInstance->getSessionId());
+               $socketInstance->setStatus(NetworkPackageHandler::PACKAGE_STATUS_FAKED);
                die(__METHOD__.': UNFINISHED!');
 
                // Register the socket with the registry and with the faked array
@@ -428,12 +425,12 @@ abstract class BaseListener extends BaseHubSystem implements Visitable {
        /**
         * Checks whether the listener would accept the given package data array
         *
-        * @param       $packageData    An instance of a DeliverablePackage class
+        * @param       $packageInstance        An instance of a DeliverablePackage class
         * @return      $accepts                Whether this listener does accept
         */
        public function ifListenerAcceptsPackageData (DeliverablePackage $packageInstance) {
                // Trace message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-LISTENER: packageData()=%d - CALLED!', strtoupper($this->getProtocolName()), count($packageData)));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-LISTENER: packageInstance=%s - CALLED!', strtoupper($this->getProtocolName()), $packageInstance));
 
                // Check if same socket protocol
                $socketProtocol = $this->getSocketInstance()->getSocketProtocol();
index a76158e4e97cd407725506bb5d1e2e81313ca582..911536ff078101b32f0ffecaec93ac124cb10f91 100644 (file)
@@ -94,6 +94,7 @@ class PackageData extends BaseHubSystem implements DeliverablePackage, Registera
         * @return      void
         */
        public function setSocketFile (SplFileInfo $socketFile) {
+               /* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('PACKAGE-DATA: Setting socketFile=%s ...', $socketFile));
                $this->socketFile = $socketFile;
        }
 
@@ -113,6 +114,7 @@ class PackageData extends BaseHubSystem implements DeliverablePackage, Registera
         * @return      void
         */
        public function setSocketType ($socketType) {
+               /* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('PACKAGE-DATA: Setting socketType=%s ...', $socketType));
                $this->socketType = $socketType;
        }
 
@@ -132,6 +134,7 @@ class PackageData extends BaseHubSystem implements DeliverablePackage, Registera
         * @return      void
         */
        public function setPackageContent ($packageContent) {
+               /* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('PACKAGE-DATA: Setting packageContent()=%d ...', strlen($packageContent)));
                $this->packageContent = $packageContent;
        }
 
@@ -151,6 +154,7 @@ class PackageData extends BaseHubSystem implements DeliverablePackage, Registera
         * @return      void
         */
        public function setContentHash ($contentHash) {
+               /* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('PACKAGE-DATA: Setting contentHash()=%d ...', strlen($contentHash)));
                $this->contentHash = $contentHash;
        }
 
index 5e10f3fc1035725520b2f16deadea964df306f72..0b487b356fdf7f097e45b11d0353e04fda3ee208 100644 (file)
@@ -181,12 +181,12 @@ class PackageFragmenter extends BaseHubSystem implements Fragmentable, Registera
        /**
         * Checks whether the given package data is already processed by this fragmenter
         *
-        * @param       $packageData    An instance of a DeliverablePackage class array
+        * @param       $packageInstance        An instance of a DeliverablePackage class array
         * @return      $isProcessed    Whether the package has been fragmented
         */
        private function isPackageProcessed (DeliverablePackage $packageInstance) {
                // Get array index
-               $index = $this->getProcessedPackagesIndex($packageData);
+               $index = $this->getProcessedPackagesIndex($packageInstance);
 
                // Is the array index there?
                $isProcessed = (
@@ -202,26 +202,26 @@ class PackageFragmenter extends BaseHubSystem implements Fragmentable, Registera
        /**
         * Marks the given package data as processed by this fragmenter
         *
-        * @param       $packageData    An instance of a DeliverablePackage class array
+        * @param       $packageInstance        An instance of a DeliverablePackage class array
         * @return      void
         */
        private function markPackageDataProcessed (DeliverablePackage $packageInstance) {
                // Remember it (until we may remove it)
-               $this->processedPackages[$this->getProcessedPackagesIndex($packageData)] = TRUE;
+               $this->processedPackages[$this->getProcessedPackagesIndex($packageInstance)] = TRUE;
        }
 
        /**
         * Getter for final hash from given package data
         *
-        * @param       $packageData    An instance of a DeliverablePackage class array
+        * @param       $packageInstance        An instance of a DeliverablePackage class array
         * @return      $finalHash              Final hash for package data
         */
        private function getFinalHashFromPackageInstance (DeliverablePackage $packageInstance) {
                // Make sure it is there
-               assert(isset($this->processedPackages[$this->getProcessedPackagesIndex($packageData)]));
+               assert(isset($this->processedPackages[$this->getProcessedPackagesIndex($packageInstance)]));
 
                // Return it
-               return $this->processedPackages[$this->getProcessedPackagesIndex($packageData)];
+               return $this->processedPackages[$this->getProcessedPackagesIndex($packageInstance)];
        }
 
        /**
@@ -449,14 +449,14 @@ class PackageFragmenter extends BaseHubSystem implements Fragmentable, Registera
         * to all chunks and prepends a chunk with all hashes only in it. It will
         * return the final hash for faster processing of packages.
         *
-        * @param       $packageData            An instance of a DeliverablePackage class array
+        * @param       $packageInstance                An instance of a DeliverablePackage class array
         * @param       $helperInstance         An instance of a ConnectionHelper class
         * @return      $finalHash                      Final hash for faster processing
         * @todo        $helperInstance is unused
         */
        public function fragmentPackageArray (DeliverablePackage $packageInstance, ConnectionHelper $helperInstance) {
                // Is this package already fragmented?
-               if (!$this->isPackageProcessed($packageData)) {
+               if (!$this->isPackageProcessed($packageInstance)) {
                        // First we need to "implode" the array
                        $rawData = implode(NetworkPackageHandler::PACKAGE_DATA_SEPARATOR, $packageInstance->getAllAsArray());
 
@@ -464,7 +464,7 @@ class PackageFragmenter extends BaseHubSystem implements Fragmentable, Registera
                        $finalHash = $this->generateHashFromRawData($rawData);
 
                        // Remember it
-                       $this->processedPackages[$this->getProcessedPackagesIndex($packageData)] = $finalHash;
+                       $this->processedPackages[$this->getProcessedPackagesIndex($packageInstance)] = $finalHash;
 
                        // Init pointer and reset serial number
                        $this->initPointer($finalHash);
@@ -477,10 +477,10 @@ class PackageFragmenter extends BaseHubSystem implements Fragmentable, Registera
                        $this->prependHashChunk($finalHash);
 
                        // Mark the package as fragmented
-                       $this->markPackageDataProcessed($packageData);
+                       $this->markPackageDataProcessed($packageInstance);
                } else {
                        // Get the final hash from the package data
-                       $finalHash = $this->getFinalHashFromPackageInstance($packageData);
+                       $finalHash = $this->getFinalHashFromPackageInstance($packageInstance);
                }
 
                // Return final hash
index 2b2ce8e4034680edc7886bafd8991e00f5f272d8..92b15b6148582630221b4d34d813b3dd98ba9abe 100644 (file)
@@ -65,9 +65,9 @@ class DhtRecipient extends BaseRecipient implements Recipient {
         * implementation will add more than one recipient to the list as a DHT is
         * distributed and the package might go to more than one recipient.
         *
-        * @param       $recipient              Recipient to resolve (e.g. could be a virtual recipient or direct session id)
-        * @param       $listInstance   An instance of a Listable class
-        * @param       $packageData    An instance of a DeliverablePackage class
+        * @param       $recipient                      Recipient to resolve (e.g. could be a virtual recipient or direct session id)
+        * @param       $listInstance           An instance of a Listable class
+        * @param       $packageInstance        An instance of a DeliverablePackage class
         * @return      void
         * @throws      FrameworkException      Could throw different exceptions depending on implementation
         */
@@ -82,7 +82,7 @@ class DhtRecipient extends BaseRecipient implements Recipient {
                $discoverInstance = ObjectFactory::createObjectByConfiguredName('dht_recipient_discovery_class');
 
                // "Discover" recipients by given package data
-               $recipients = $discoverInstance->resolveRecipientsByPackageData($packageData);
+               $recipients = $discoverInstance->resolveRecipientsByPackageData($packageInstance);
 
                // Now "walk" through all elements and add them to the list
                foreach ($recipients as $recipient) {
index 306672a98f78bbca76373f5c45c7fcdfdce9bbd1..5497d48d20950aa22e2f22798463eb4b1ef12c08 100644 (file)
@@ -62,10 +62,10 @@ class DirectRecipient extends BaseRecipient implements Recipient {
         * Tries to resolve given recipient into session ids or Universal Node Locator
         * depending on implementation (hint: Template Method Pattern)
         *
-        * @param       $recipient              Recipient to resolve (e.g. could be a virtual recipient or direct session id)
-        * @param       $listInstance   An instance of a Listable class
-        * @param       $packageData    An instance of a DeliverablePackage class
-        * @return      $resolved               Resolved recipient or VOID if only the set list has been filled
+        * @param       $recipient                      Recipient to resolve (e.g. could be a virtual recipient or direct session id)
+        * @param       $listInstance           An instance of a Listable class
+        * @param       $packageInstance        An instance of a DeliverablePackage class
+        * @return      $resolved                       Resolved recipient or VOID if only the set list has been filled
         * @throws      FrameworkException      Could throw different exceptions depending on implementation
         */
        public function resolveRecipient ($recipient, Listable $listInstance, DeliverablePackage $packageInstance) {
index 2978c7e94922b1fac221ed4355e31ea4c61db385..a08741b7f1b0db8eb52a795a93fdfda57458edac 100644 (file)
@@ -62,10 +62,10 @@ class SelfRecipient extends BaseRecipient implements Recipient {
         * Tries to resolve given recipient into session ids or Universal Node Locator
         * depending on implementation (hint: Template Method Pattern)
         *
-        * @param       $recipient              Recipient to resolve (e.g. could be a virtual recipient or direct session id)
-        * @param       $listInstance   An instance of a Listable class
-        * @param       $packageData    An instance of a DeliverablePackage class
-        * @return      $resolved               Resolved recipient or VOID if only the set list has been filled
+        * @param       $recipient                      Recipient to resolve (e.g. could be a virtual recipient or direct session id)
+        * @param       $listInstance           An instance of a Listable class
+        * @param       $packageInstance        An instance of a DeliverablePackage class
+        * @return      $resolved                       Resolved recipient or VOID if only the set list has been filled
         * @throws      FrameworkException      Could throw different exceptions depending on implementation
         */
        public function resolveRecipient ($recipient, Listable $listInstance, DeliverablePackage $packageInstance) {
index 2900af80282fbaca2cb8c4b8f994fd4e06dac4f6..f0d1f4c3e642360cfe6250f22883a1dcdefed46b 100644 (file)
@@ -62,10 +62,10 @@ class UpperRecipient extends BaseRecipient implements Recipient {
         * Tries to resolve given recipient into session ids or Universal Node Locator
         * depending on implementation (hint: Template Method Pattern)
         *
-        * @param       $recipient              Recipient to resolve (e.g. could be a virtual recipient or direct session id)
-        * @param       $listInstance   An instance of a Listable class
-        * @param       $packageData    An instance of a DeliverablePackage class
-        * @return      $resolved               Resolved recipient or VOID if only the set list has been filled
+        * @param       $recipient                      Recipient to resolve (e.g. could be a virtual recipient or direct session id)
+        * @param       $listInstance           An instance of a Listable class
+        * @param       $packageInstance        An instance of a DeliverablePackage class
+        * @return      $resolved                       Resolved recipient or VOID if only the set list has been filled
         * @throws      FrameworkException      Could throw different exceptions depending on implementation
         */
        public function resolveRecipient ($recipient, Listable $listInstance, DeliverablePackage $packageInstance) {