From 914dfa3693b96e822e5d60adae52be561cab8412 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 21 Aug 2009 22:04:19 +0000 Subject: [PATCH] More NPEs catched (TODO: Should be rewritten) --- .../main/user/class_ShipSimuBaseUser.php | 48 +++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/application/ship-simu/main/user/class_ShipSimuBaseUser.php b/application/ship-simu/main/user/class_ShipSimuBaseUser.php index 426edcb..ffc4c6e 100644 --- a/application/ship-simu/main/user/class_ShipSimuBaseUser.php +++ b/application/ship-simu/main/user/class_ShipSimuBaseUser.php @@ -106,8 +106,16 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // By default they want to help. $ifGovHelps = true; - // First get a government instance from registry - $governmentInstance = Registry::getRegistry()->getInstance('government'); + // Init instance + $governmentInstance = null; + + try { + // First get a government instance from registry + $governmentInstance = Registry::getRegistry()->getInstance('government'); + } catch (NullPointerException $e) { + // Instance not found in registry + // @TODO We should log this exception later + } // Is it there? if (is_null($governmentInstance)) { @@ -137,8 +145,16 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // By default they want to help. $ifGovHelps = true; - // First get a government instance from registry - $governmentInstance = Registry::getRegistry()->getInstance('government'); + // Init instance + $governmentInstance = null; + + try { + // First get a government instance from registry + $governmentInstance = Registry::getRegistry()->getInstance('government'); + } catch (NullPointerException $e) { + // Instance not found in registry + // @TODO We should log this exception later + } // Is it there? if (is_null($governmentInstance)) { @@ -169,8 +185,16 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // Per default the money bank cannot pay $bankLends = false; - // Get a money bank instance from registry - $bankInstance = Registry::getRegistry()->getInstance('money_bank'); + // Init instance + $bankInstance = null; + + try { + // Get a money bank instance from registry + $bankInstance = Registry::getRegistry()->getInstance('money_bank'); + } catch (NullPointerException $e) { + // Instance not found in registry + // @TODO We should log this exception later + } // Is it there? if (is_null($bankInstance)) { @@ -205,8 +229,16 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // For default he can still get money $hasMaxCredits = false; - // Get a money bank instance from registry - $bankInstance = Registry::getRegistry()->getInstance('money_bank'); + // Init instance + $bankInstance = null; + + try { + // Get a money bank instance from registry + $bankInstance = Registry::getRegistry()->getInstance('money_bank'); + } catch (NullPointerException $e) { + // Instance not found in registry + // @TODO We should log this exception later + } // Is it there? if (is_null($bankInstance)) { -- 2.30.2