From 054578c8a098f60089d4200e0ff2691333c61617 Mon Sep 17 00:00:00 2001 From: Frank Brendel Date: Thu, 15 Feb 2018 13:55:50 +0100 Subject: [PATCH] sysutils/monit: fix test deletion (#564) --- .../controllers/OPNsense/Monit/Api/SettingsController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php index 9a50fa23e..621aaaf45 100644 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php +++ b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php @@ -168,8 +168,11 @@ class SettingsController extends ApiControllerBase if ($mdlMonit->$nodeType->del($uuid) == true) { // delete relations if ($nodeType == 'test') { - $nodeName = $mdlMonit->getNodeByReference($nodeType . '.' . $uuid . '.name')->__toString(); - $this->deleteRelations('service', 'tests', $uuid, 'test', $nodeName, $mdlMonit); + $nodeName = $mdlMonit->getNodeByReference($nodeType . '.' . $uuid . '.name'); + if ($nodeName != null) { + $nodeName = $nodeName->__toString(); + $this->deleteRelations('service', 'tests', $uuid, 'test', $nodeName, $mdlMonit); + } } $mdlMonit->serializeToConfig(); Config::getInstance()->save();