Skip to content

Commit f2ab7eb

Browse files
thomasvargiudkgroot
authored andcommitted
Fixed marcelog#57: Incorrect EOF test in getMessages
Cherry-Picked 6cbc707 from thomasvargiu (marcelog#122) references marcelog#57
1 parent 78f99f2 commit f2ab7eb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/PAMI/Client/Impl/ClientImpl.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class ClientImpl implements IClient
131131

132132
/**
133133
* The receiving queue.
134-
* @var IncomingMessage[]
134+
* @var ResponseMessage[]
135135
*/
136136
private $incomingQueue;
137137

@@ -250,7 +250,7 @@ protected function getMessages()
250250
// Read something.
251251
//$read = @fread($this->socket, 65535);
252252
$read = @fread($this->socket, 8192);
253-
if ($read === false || @feof($this->socket)) {
253+
if ($read === false || (empty($read) && @feof($this->socket))) {
254254
throw new ClientException('Error reading');
255255
}
256256
$this->currentProcessingMessage .= $read;
@@ -417,12 +417,12 @@ private function messageToEvent($msg)
417417
*
418418
* @todo not suitable for multithreaded applications.
419419
*
420-
* @return \PAMI\Message\IncomingMessage
420+
* @return \PAMI\Message\Response\ResponseMessage
421421
*/
422422
protected function getRelated(OutgoingMessage $message)
423423
{
424424
$ret = false;
425-
$id = $message->getActionID('ActionID');
425+
$id = $message->getActionID();
426426
if (isset($this->incomingQueue[$id])) {
427427
$response = $this->incomingQueue[$id];
428428
if ($response->isComplete()) {

0 commit comments

Comments
 (0)