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

fixed wrong app type used when client is acknowledging an alarm

Browse Source 
(slightly revised to also deal with arrays although they are technically
invalid when acking an alarm)
This commit is contained in:
Jeff Hill
2006-10-04 20:46:11 +00:00
parent 394222ac72
commit b75bdb1930
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cas/generic/casStrmClient.cc
View File

@@ -2124,7 +2124,17 @@ caStatus casStrmClient::writeArrayData()
aitEnum bestExternalType = this->ctx.getPV()->bestExternalType ();
gdd * pDD = new gddAtomic(gddAppType_value, bestExternalType, 1, pHdr->m_count);
// the application type best maching this DBR_XXX type
aitUint16 app = gddDbrToAit[pHdr->m_dataType].app;
// When possible, preconvert to best external type in order
// to reduce problems in the services
aitEnum bestWritePrimType =
app == gddAppType_value ?
this->ctx.getPV()->bestExternalType () :
type;
gdd * pDD = new gddAtomic( app, bestWritePrimType, 1, pHdr->m_count);
if ( ! pDD ) {
return S_cas_noMemory;
}
@@ -2158,7 +2168,7 @@ caStatus casStrmClient::writeArrayData()
// will be allowed to ref the DD
//
caStatus status = S_cas_noConvert;
gddStatus gddStat = aitConvert ( bestExternalType,
gddStatus gddStat = aitConvert ( bestWritePrimType,
pData, type, this->ctx.getData(),
pHdr->m_count, &this->ctx.getPV()->enumStringTable() );
if ( gddStat >= 0 ) {