From eb31fcedeb6f6c0881a8c68e73028542dd34a079 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Mon, 13 Jul 2015 17:51:46 -0400
Subject: [PATCH] iocInit: dbCa shutdown order

---
 src/ioc/misc/iocInit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ioc/misc/iocInit.c b/src/ioc/misc/iocInit.c
index 14dc756ca..11f0e1f75 100644
--- a/src/ioc/misc/iocInit.c
+++ b/src/ioc/misc/iocInit.c
@@ -692,11 +692,13 @@ int iocShutdown(void)
         iterateRecords(doFreeRecord, NULL);
         dbLockCleanupRecords(pdbbase);
         asShutdown();
+    }
+    dbCaShutdown(); /* must be before dbChannelExit */
+    if (iocBuildMode==buildIsolated) {
         dbChannelExit();
         dbProcessNotifyExit();
         iocshFree();
     }
-    dbCaShutdown();
     iocState = iocStopped;
     iocBuildMode = buildRSRV;
     return 0;