From 11172b62b0f0312fef6a4a0abca982a2a6301649 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 24 Jun 2009 15:05:13 +0200 Subject: quick and dirty fix for one race condition It is intentionally quick & dirty, as I would like to do some better patch, if possible. For that, I probably need the commented-out code, thus no delete. --- action.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index 09dd7df4..d43028b8 100644 --- a/action.c +++ b/action.c @@ -1240,7 +1240,7 @@ actionCallAction(action_t *pAction, msg_t *pMsg) /* We need to lock the mutex only for repeated line processing. * rgerhards, 2009-06-19 */ - if(pAction->f_ReduceRepeated == 1) { + //if(pAction->f_ReduceRepeated == 1) { pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); LockObj(pAction); pthread_cleanup_push(mutexCancelCleanup, pAction->Sync_mut); @@ -1250,9 +1250,9 @@ actionCallAction(action_t *pAction, msg_t *pMsg) UnlockObj(pAction); pthread_cleanup_pop(0); /* remove mutex cleanup handler */ pthread_setcancelstate(iCancelStateSave, NULL); - } else { - iRet = doActionCallAction(pAction, pMsg); - } + //} else { + //iRet = doActionCallAction(pAction, pMsg); + //} RETiRet; } -- cgit v1.2.3