Skip to content

Commit ef38d6e

Browse files
author
freyhsiao
committed
add default container.
1 parent 31bba0e commit ef38d6e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/Queue/CMQQueue.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Freyo\LaravelQueueCMQ\Queue\Driver\Message;
88
use Freyo\LaravelQueueCMQ\Queue\Driver\Topic;
99
use Freyo\LaravelQueueCMQ\Queue\Jobs\CMQJob;
10+
use Illuminate\Container\Container;
1011
use Illuminate\Contracts\Queue\Queue as QueueContract;
1112
use Illuminate\Queue\Queue;
1213
use Illuminate\Support\Arr;
@@ -210,13 +211,16 @@ public function pop($queue = null)
210211
$message = $queue->receive_message($this->queueOptions['polling_wait_seconds']);
211212
} catch (CMQServerException $e) {
212213
if (self::CMQ_QUEUE_NO_MESSAGE_CODE === (int) $e->getCode()) { // ignore no message
213-
return;
214+
return null;
214215
}
215216

216217
throw $e;
217218
}
218219

219-
return new CMQJob($this->container, $this, $message, $queue, $this->connectionName);
220+
return new CMQJob(
221+
$this->container ?: Container::getInstance(),
222+
$this, $message, $queue, $this->connectionName
223+
);
220224
}
221225

222226
/**

0 commit comments

Comments
 (0)