epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

added EXCEPTION_GUARD to monitorEvent CBs

Browse Source
This commit is contained in:
Matej Sekoranja
2012-08-03 22:48:02 +02:00
parent e2896ddf60
commit 9511408960
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvAccessApp/remoteClient/clientContextImpl.cpp
+3 -6
View File
@@ -1834,8 +1834,7 @@ namespace epics {
Lock guard(m_mutex);
m_gotMonitor = true;
// no data, only notify
Monitor::shared_pointer thisMonitor = shared_from_this();
m_callback->monitorEvent(thisMonitor);
EXCEPTION_GUARD(m_callback->monitorEvent(shared_from_this()));
}
virtual MonitorElement::shared_pointer poll() {
@@ -1906,8 +1905,7 @@ namespace epics {
m_monitorElement->pvStructurePtr->deserialize(payloadBuffer, transport.get(), m_monitorElement->changedBitSet.get());
m_monitorElement->overrunBitSet->deserialize(payloadBuffer, transport.get());
m_gotMonitor = true;
Monitor::shared_pointer thisMonitor = shared_from_this();
m_callback->monitorEvent(thisMonitor);
EXCEPTION_GUARD(m_callback->monitorEvent(shared_from_this()));
}
virtual MonitorElement::shared_pointer poll() {
@@ -1993,8 +1991,7 @@ namespace epics {
m_monitorElement->pvStructurePtr->deserialize(payloadBuffer, transport.get(), m_monitorElement->changedBitSet.get());
m_monitorElement->overrunBitSet->deserialize(payloadBuffer, transport.get());
m_gotMonitor = true;
Monitor::shared_pointer thisMonitor = shared_from_this();
m_callback->monitorEvent(thisMonitor);
EXCEPTION_GUARD(m_callback->monitorEvent(shared_from_this()));
}
else
{