Merge pull request ezsystems#35 from ezsystems/regressionConsoleEvent…

…ResetKernel EZP-24691: Fixed regression when resetting the kernel and it is not yet installed/configured
ezpublishlegacy · Sep 2, 2015 · 89b52f1 · 89b52f1
2 parents 4dda247 + cdec71b
commit 89b52f1
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/mvc/Kernel/Loader.php b/mvc/Kernel/Loader.php
@@ -313,12 +313,15 @@ public function setRestHandler(ezpKernelHandler $handler)
      */
     public function resetKernel()
     {
-        /** @var \Closure $kernelClosure */
-        $kernelClosure = $this->container->get('ezpublish_legacy.kernel');
-        $this->eventDispatcher->dispatch(
-            LegacyEvents::PRE_RESET_LEGACY_KERNEL,
-            new PreResetLegacyKernelEvent($kernelClosure())
-        );
+        // Reset the kernel only if it has been initialized.
+        if (LegacyKernel::hasInstance()) {
+            /** @var \Closure $kernelClosure */
+            $kernelClosure = $this->container->get('ezpublish_legacy.kernel');
+            $this->eventDispatcher->dispatch(
+                LegacyEvents::PRE_RESET_LEGACY_KERNEL,
+                new PreResetLegacyKernelEvent($kernelClosure())
+            );
+        }
 
         LegacyKernel::resetInstance();
         $this->webHandler = null;