Getting branch up to date with trunk

2016-03-21 10:01:11 -05:00
parent 5c93eb6049 45db78981c
commit 394820318c
1 changed files with 2 additions and 1 deletions
@@ -643,10 +643,11 @@ static void doCloseLinks(dbRecordType *pdbRecordType, dbCommon *precord,
            }
            dbCaRemoveLink(NULL, plink);

-        } else if (plink->type == DB_LINK) {
+        } else if (iocBuildMode==buildIsolated && plink->type == DB_LINK) {
            /* free link, but don't split lockset like dbDbRemoveLink() */
            free(plink->value.pv_link.pvt);
            plink->type = PV_LINK;
+            plink->lset = NULL;
        }
    }