Merge pull request #31 from dhickin/make_release_4.1.3

Make release 4.1.3
2016-03-07 22:30:43 +01:00
parent 7dc7615de2 f1c2a3d5d4
commit 6b6c1853a1
3 changed files with 8 additions and 2 deletions
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+Release 4.1.3 
+==========
+
+* Monitor fix: element no longer queued when overrun in progress.
+
 Release 4.1.2 
 ==========

--- a/src/pva/pvaVersion.h
+++ b/src/pva/pvaVersion.h
@@ -26,7 +26,7 @@
 // TODO to be generated, etc.
 #define EPICS_PVA_MAJOR_VERSION 4
 #define EPICS_PVA_MINOR_VERSION 1
-#define EPICS_PVA_MAINTENANCE_VERSION 2
+#define EPICS_PVA_MAINTENANCE_VERSION 3
 #define EPICS_PVA_DEVELOPMENT_FLAG 0

 namespace epics {
--- a/src/remoteClient/clientContextImpl.cpp
+++ b/src/remoteClient/clientContextImpl.cpp
@@ -2295,7 +2295,8 @@ namespace epics {

                   m_up2datePVStructure = pvStructure;

-                   m_monitorQueue.push(newElement);
+                   if (!m_overrunInProgress)
+                       m_monitorQueue.push(newElement);
               }

               if (!m_overrunInProgress)