fixes

OPCFoundation · Oct 13, 2024 · f4af3f4 · f4af3f4
1 parent 5c22a0c
commit f4af3f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Libraries/Opc.Ua.Server/Subscription/MonitoredItem/MonitoredItem.cs b/Libraries/Opc.Ua.Server/Subscription/MonitoredItem/MonitoredItem.cs
@@ -1149,7 +1149,6 @@ public virtual bool Publish(OperationContext context, Queue<EventFieldList> noti
                         {
                             moreValuesToPublish = true;
                         }
-                        notifications.Enqueue(overflowEvent);
                     }
 
                     Utils.LogTrace(Utils.TraceMasks.OperationDetail, "MONITORED ITEM: Publish(QueueSize={0})", notifications.Count);

diff --git a/Libraries/Opc.Ua.Server/Subscription/MonitoredItem/QueueHandler/EventQueueHandler.cs b/Libraries/Opc.Ua.Server/Subscription/MonitoredItem/QueueHandler/EventQueueHandler.cs
@@ -192,8 +192,8 @@ public uint Publish(OperationContext context, Queue<EventFieldList> notification
                 notifications.Enqueue(fields);
                 notificationCount++;
             }
-            //if overflow event is placed at the end of the queue only set overflow to false once the queue is empty
-            m_overflow = m_overflow && m_eventQueue.ItemsInQueue > 0 && !m_discardOldest;
+            //if overflow event is placed at the end of the queue only set overflow to false if the overflow event still fits into the publish
+            m_overflow = m_overflow && notificationCount == maxNotificationsPerPublish && !m_discardOldest;
 
             return notificationCount;
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                             {
                                 moreValuesToPublish = true;
                             }
-                            notifications.Enqueue(overflowEvent);
                         }
                         Utils.LogTrace(Utils.TraceMasks.OperationDetail, "MONITORED ITEM: Publish(QueueSize={0})", notifications.Count);
@@ Expand Down @@