From 473790124bbf1a5f0cd377082ae71a399caf3a30 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Thu, 13 Feb 2020 17:07:42 +0100 Subject: [PATCH] bugfix: ai SoftDevice should return error status when get fails --- modules/database/src/std/dev/devAiSoft.c | 3 ++- modules/database/test/std/rec/regressTest.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/database/src/std/dev/devAiSoft.c b/modules/database/src/std/dev/devAiSoft.c index e41d9fedb..a9b32a335 100644 --- a/modules/database/src/std/dev/devAiSoft.c +++ b/modules/database/src/std/dev/devAiSoft.c @@ -85,9 +85,10 @@ static long read_ai(aiRecord *prec) prec->udf = FALSE; prec->dpvt = &devAiSoft; /* Any non-zero value */ + return 2; } else prec->dpvt = NULL; - return 2; + return status; } diff --git a/modules/database/test/std/rec/regressTest.c b/modules/database/test/std/rec/regressTest.c index 661463984..fd4f0a885 100644 --- a/modules/database/test/std/rec/regressTest.c +++ b/modules/database/test/std/rec/regressTest.c @@ -132,7 +132,7 @@ void testCADisconn(void) startRegressTestIoc("badCaLink.db"); - testdbPutFieldOk("ai:disconn.PROC", DBF_LONG, 1); + testdbPutFieldFail(-1, "ai:disconn.PROC", DBF_LONG, 1); testdbGetFieldEqual("ai:disconn.SEVR", DBF_LONG, INVALID_ALARM); testdbGetFieldEqual("ai:disconn.STAT", DBF_LONG, LINK_ALARM); }