[icinga-checkins] icinga.org: icingaweb2-module-director/master: IcingaObject: no loop detection on unstored...

git at icinga.org git at icinga.org
Wed Oct 12 16:27:22 CEST 2016


Module: icingaweb2-module-director
Branch: master
Commit: 05f991c585b75a43811dfa94ed5add26bb7db40a
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=05f991c585b75a43811dfa94ed5add26bb7db40a

Author: Thomas Gelf <thomas at gelf.net>
Date:   Wed Oct 12 14:26:44 2016 +0000

IcingaObject: no loop detection on unstored...

...objects

refs #11803

---

 library/Director/Objects/IcingaObject.php |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Director/Objects/IcingaObject.php b/library/Director/Objects/IcingaObject.php
index 9d6fb4f..e38396f 100644
--- a/library/Director/Objects/IcingaObject.php
+++ b/library/Director/Objects/IcingaObject.php
@@ -946,7 +946,9 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
         }
 
         // Force exception
-        $this->triggerLoopDetection();
+        if ($this->hasBeenLoadedFromDb()) {
+            $this->triggerLoopDetection();
+        }
 
         $vals = array();
         $vals['_MERGED_']    = (object) array();



More information about the icinga-checkins mailing list