From: Franz Koch Date: Wed, 1 Dec 2010 12:30:08 +0000 (+0000) Subject: [+TASK] Extbase (Object): Make sure the class info cache is returning valid objects X-Git-Tag: TYPO3_6-2-0alpha1~21^2~507 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/459974883e0fbb6c66131c1f1dd0311c20a34136 [+TASK] Extbase (Object): Make sure the class info cache is returning valid objects --- diff --git a/typo3/sysext/extbase/Classes/Object/Container/Container.php b/typo3/sysext/extbase/Classes/Object/Container/Container.php index 5de5cfeba930..62e5d928c44c 100644 --- a/typo3/sysext/extbase/Classes/Object/Container/Container.php +++ b/typo3/sysext/extbase/Classes/Object/Container/Container.php @@ -245,7 +245,9 @@ class Tx_Extbase_Object_Container_Container { * @return Tx_Extbase_Object_Container_ClassInfo */ private function getClassInfo($className) { - if (!$this->cache->has($className)) { + // we also need to make sure that the cache is returning a vaild object + // in case something went wrong with unserialization etc.. + if (!$this->cache->has($className) || !is_object($this->cache->get($className))) { $this->cache->set($className, $this->classInfoFactory->buildClassInfoFromClassName($className)); } return $this->cache->get($className);