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

Clean up JSON_LINKs in doCloseLinks

Browse Source
This commit is contained in:
Andrew Johnson
2016-09-03 22:22:12 -05:00
parent f8d6cd98a0
commit 25315882ec
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ioc/misc/iocInit.c
View File

@@ -637,17 +637,15 @@ static void doCloseLinks(dbRecordType *pdbRecordType, dbCommon *precord,
pdbRecordType->papFldDes[pdbRecordType->link_ind[j]];
DBLINK *plink = (DBLINK *)((char *)precord + pdbFldDes->offset);
if (plink->type == CA_LINK) {
if (plink->type == CA_LINK ||
plink->type == JSON_LINK ||
(plink->type == DB_LINK && iocBuildMode == buildIsolated)) {
if (!locked) {
dbScanLock(precord);
locked = 1;
}
dbRemoveLink(NULL, plink);
}
else if (iocBuildMode==buildIsolated && plink->type == DB_LINK) {
/* free link, but don't split lockset */
dbRemoveLink(NULL, plink);
}
}
if (precord->dset &&