tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-28 16:14:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

add some object locking to the Dump method (which could theoreticylly suffer from same reace condition as serializer)

Browse Source
This commit is contained in:
Elias Ohm 2019-05-01 11:49:07 +02:00
parent 91296c2a25
commit 44ac6cf1ec
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/icinga/timeperiod.cpp
View File

@ -221,6 +221,7 @@ void TimePeriod::Merge(const TimePeriod::Ptr& timeperiod, bool include)
void TimePeriod::UpdateRegion(double begin, double end, bool clearExisting) void TimePeriod::UpdateRegion(double begin, double end, bool clearExisting)
{ {
if (clearExisting) { if (clearExisting) {
ObjectLock olock(this);
SetSegments(new Array()); SetSegments(new Array());
} else { } else {
if (begin < GetValidEnd()) if (begin < GetValidEnd())
@ -346,6 +347,8 @@ void TimePeriod::UpdateTimerHandler()
void TimePeriod::Dump() void TimePeriod::Dump()
{ {
ObjectLock olock(this);
Array::Ptr segments = GetSegments(); Array::Ptr segments = GetSegments();
Log(LogDebug, "TimePeriod") Log(LogDebug, "TimePeriod")