From 9198428619451d160ff17628f3d31f1121ee5e61 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Thu, 9 Jul 2015 17:16:39 -0400
Subject: [PATCH] dbLock: minor

must match following condition
---
 src/ioc/db/dbLock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ioc/db/dbLock.c b/src/ioc/db/dbLock.c
index 200fdf280..b248cba46 100644
--- a/src/ioc/db/dbLock.c
+++ b/src/ioc/db/dbLock.c
@@ -641,7 +641,7 @@ void dbLockSetMerge(dbLocker *locker, dbCommon *pfirst, dbCommon *psecond)
     assert(A && B);
 
 #ifdef LOCKSET_DEBUG
-    if(A->owner!=myself || B->owner!=myself) {
+    if(locker && (A->owner!=myself || B->owner!=myself)) {
         errlogPrintf("dbLockSetMerge(%p,\"%s\",\"%s\") ownership violation %p %p (%p)\n",
                      locker, pfirst->name, psecond->name,
                      A->owner, B->owner, myself);