From 25315882ec006b3ad652737c1afa5ed5fc5b443e Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Sat, 3 Sep 2016 22:22:12 -0500
Subject: [PATCH] Clean up JSON_LINKs in doCloseLinks

---
 src/ioc/misc/iocInit.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/ioc/misc/iocInit.c b/src/ioc/misc/iocInit.c
index f863e3fe9..30854c3bf 100644
--- a/src/ioc/misc/iocInit.c
+++ b/src/ioc/misc/iocInit.c
@@ -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 &&