Merge pull request #237 from doctrine/fix-timeout

Fix bug where timeout is set to 1 ms
doctrine · Nov 24, 2015 · 7a724d9 · 7a724d9
2 parents c734a66 + a3d9ea2
commit 7a724d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG-1.2.md b/CHANGELOG-1.2.md
@@ -9,3 +9,4 @@ in 1.2.x patch versions.
 
  * [#229](https://github.com/doctrine/mongodb/pull/229): Fix EagerCursor::skip() method calling limit method of base cursor instead of skip method
  * [#231](https://github.com/doctrine/mongodb/pull/231): Remove count method declaration in CursorInterface to fix fatal error for PHP 5.3
+ * [#237](https://github.com/doctrine/mongodb/pull/237): Fix bug where timeout is set to 1 ms
diff --git a/lib/Doctrine/MongoDB/Collection.php b/lib/Doctrine/MongoDB/Collection.php
@@ -951,7 +951,7 @@ protected function doAggregateCursor(array $pipeline, array $options = array())
 
         $timeout = isset($clientOptions['socketTimeoutMS'])
             ? $clientOptions['socketTimeoutMS']
-            : (isset($clientOptions['timeout']) ? isset($clientOptions['timeout']) : null);
+            : (isset($clientOptions['timeout']) ? $clientOptions['timeout'] : null);
 
         $mongoCollection = $this->mongoCollection;
         $commandCursor = $this->retry(function() use ($mongoCollection, $pipeline, $commandOptions) {