Sync: do not deal with 'disabled' for objects...

...without such properties (e.g. Sets)
Icinga · Oct 13, 2017 · 9e193db · 9e193db
1 parent 8ec0fad
commit 9e193db
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/library/Director/Import/Sync.php b/library/Director/Import/Sync.php
@@ -594,6 +594,7 @@ protected function prepare()
             }
         }
 
+        /** @var DbObject|IcingaObject $object */
         foreach ($newObjects as $key => $object) {
             if (array_key_exists($key, $this->objects)) {
                 switch ($this->rule->get('update_policy')) {
@@ -605,7 +606,7 @@ protected function prepare()
                         // TODO: re-evaluate merge settings. vars.x instead of
                         //       just "vars" might suffice.
                         $this->objects[$key]->merge($object, $this->replaceVars);
-                        if (! $hasDisabled) {
+                        if (! $hasDisabled && $object->hasProperty('disabled')) {
                             $this->objects[$key]->resetProperty('disabled');
                         }
                         break;