From b665dac6696c79c3c0c03940077da810dd96d3d4 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Tue, 23 Feb 2021 09:25:19 -0500 Subject: [PATCH] The following changes were made: 1) PvaClientChannel::channelCreated no longer declares channel connected. PvaClientChannel::channelStateChange does this. 2) PvaClientNTMultiData::endDeltaTime no longer calls unionValue[i] = PVUnionPtr() --- src/pvaClientChannel.cpp | 4 ---- src/pvaClientNTMultiData.cpp | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/pvaClientChannel.cpp b/src/pvaClientChannel.cpp index d8a225e..8a11213 100644 --- a/src/pvaClientChannel.cpp +++ b/src/pvaClientChannel.cpp @@ -182,10 +182,6 @@ void PvaClientChannel::channelCreated(const Status& status, Channel::shared_poin + " status " + status.getMessage() + " why??"; throw std::runtime_error(message); } - if(channel->isConnected()) { - connectState = connected; - waitForConnect.signal(); - } } void PvaClientChannel::channelStateChange( diff --git a/src/pvaClientNTMultiData.cpp b/src/pvaClientNTMultiData.cpp index bcc48a5..6ba92c9 100644 --- a/src/pvaClientNTMultiData.cpp +++ b/src/pvaClientNTMultiData.cpp @@ -142,8 +142,6 @@ void PvaClientNTMultiData::endDeltaTime(bool valueOnly) PVFieldPtr pvValue = pvst->getSubField("value"); if(pvValue) { unionValue[i]->set(pvst->getSubField("value")); - } else { - unionValue[i] = PVUnionPtr(); } } else { unionValue[i]->set(pvst);