]> granicus.if.org Git - icinga2/commitdiff
Make sure that TimePeriod segments are being merged properly.
authorGunnar Beutner <gunnar.beutner@netways.de>
Thu, 5 Dec 2013 11:30:02 +0000 (12:30 +0100)
committerGunnar Beutner <gunnar.beutner@netways.de>
Thu, 5 Dec 2013 11:30:02 +0000 (12:30 +0100)
Refs #5268

lib/icinga/timeperiod.cpp

index 8fe6b21e2851a0c7f132f7495841824dd1ae464d..4b081af79266fa85ebb86146c0cb7870e7e919e4 100644 (file)
@@ -70,12 +70,12 @@ void TimePeriod::AddSegment(double begin, double end)
                        if (segment->Get("begin") <= begin && segment->Get("end") >= end)
                                return; /* New segment is fully contained in this segment. */
 
-                       if (segment->Get("begin") < begin && segment->Get("end") > begin) {
+                       if (segment->Get("begin") <= begin && segment->Get("end") >= begin) {
                                segment->Set("end", end); /* Extend an existing segment. */
                                return;
                        }
 
-                       if (segment->Get("begin") > begin && segment->Get("begin") < end) {
+                       if (segment->Get("begin") >= begin && segment->Get("begin") <= end) {
                                segment->Set("begin", begin); /* Extend an existing segment. */
                                return;
                        }