浏览代码

Merge remote branch 'danielholmes/client_kernel_shutdown'

* danielholmes/client_kernel_shutdown:
  [FrameworkBundle] added a check in Client to only shutdown the kernel if a previous request has been made
Fabien Potencier 14 年之前
父节点
当前提交
09de9fe85f
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      src/Symfony/Bundle/FrameworkBundle/Client.php

+ 8 - 2
src/Symfony/Bundle/FrameworkBundle/Client.php

@@ -25,6 +25,8 @@ use Symfony\Component\HttpFoundation\Response;
  */
 class Client extends BaseClient
 {
+    private $hasPerformedRequest = false;
+    
     /**
      * Returns the container.
      *
@@ -68,7 +70,11 @@ class Client extends BaseClient
      */
     protected function doRequest($request)
     {
-        $this->kernel->shutdown();
+        if ($this->hasPerformedRequest) {
+            $this->kernel->shutdown();
+        } else {
+            $this->hasPerformedRequest = true;
+        }
 
         return $this->kernel->handle($request);
     }
@@ -98,4 +104,4 @@ require_once '$path';
 echo serialize(\$kernel->handle(unserialize('$request')));
 EOF;
     }
-}
+}