From ba2826e32f5caa043b1bbfbc9425653908731c4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 21 Aug 2009 20:32:07 +0000 Subject: [PATCH] NPE catched (TODO: we should log it later) --- inc/classes/main/helper/class_BaseHelper.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/inc/classes/main/helper/class_BaseHelper.php b/inc/classes/main/helper/class_BaseHelper.php index c79ccf14..c9e9b068 100644 --- a/inc/classes/main/helper/class_BaseHelper.php +++ b/inc/classes/main/helper/class_BaseHelper.php @@ -190,8 +190,13 @@ class BaseHelper extends BaseFrameworkSystem { * @throws NullPointerException If recovery of requested value instance failed */ public function prefetchValueInstance ($registryKey, $extraKey = null) { - // Get the required instance - $this->valueInstance = Registry::getRegistry()->getInstance($registryKey); + try { + // Get the required instance + $this->valueInstance = Registry::getRegistry()->getInstance($registryKey); + } catch (NullPointerException $e) { + // Not set in registry + // @TODO Try to log it here + } // Is the value instance valid? if (is_null($this->valueInstance)) { @@ -204,10 +209,9 @@ class BaseHelper extends BaseFrameworkSystem { $extraInstance = Registry::getRegistry()->getInstance($extraKey); } // END - if - // Get the requested instance try { + // Get the requested instance $this->valueInstance = ObjectFactory::createObjectByConfiguredName($registryKey . '_class', array($extraInstance)); - } catch (FrameworkException $e) { // Okay, nothing found so throw a null pointer exception here throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER); -- 2.39.5