Merge 3.16 (after 3.16.2-rc1) into 7.0

2018-10-26 17:04:53 -05:00
parent c08b1ef5d1 94ebd0fe48
commit 2efe56c6d1
157 changed files with 5520 additions and 1623 deletions
@@ -265,8 +265,19 @@ int dbIsLinkConnected(const struct link *plink)
 {
    lset *plset = plink->lset;

-    if (!plset || !plset->isConnected)
+    if (!plset)
        return FALSE;
+    if (!plset->isVolatile)
+        return TRUE;
+
+    if (!plset->isConnected) {
+        struct dbCommon *precord = plink->precord;
+
+        errlogPrintf("dbLink: Link type for '%s.%s' is volatile but has no"
+            " lset::isConnected() method\n",
+            precord->name, dbLinkFieldName(plink));
+        return FALSE;
+    }

    return plset->isConnected(plink);
 }