dbLock: minor

must match following condition
2015-07-09 17:16:39 -04:00
parent 8f3fcc2787
commit 9198428619
1 changed files with 1 additions and 1 deletions
@@ -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);