From f1c0458adc1e47d0ec64fb1941483988fba64220 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 2 Jul 2012 18:00:55 -0400 Subject: [PATCH] dbEvent: use filtered field log on post event queue --- src/ioc/db/dbEvent.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ioc/db/dbEvent.c b/src/ioc/db/dbEvent.c index 24d81a04a..53e7b5e36 100644 --- a/src/ioc/db/dbEvent.c +++ b/src/ioc/db/dbEvent.c @@ -931,11 +931,13 @@ static int event_read ( struct event_que *ev_que ) UNLOCKEVQUE (ev_que); /* Run post-event-queue filter chain */ if (ellCount(&pevent->chan->post_chain)) { - dbChannelRunPostChain(pevent->chan, pfl); + pfl = dbChannelRunPostChain(pevent->chan, pfl); + } + if (pfl) { + /* Issue user callback */ + ( *user_sub ) ( pevent->user_arg, pevent->chan, + ev_que->evque[ev_que->getix] != EVENTQEMPTY, pfl ); } - /* Issue user callback */ - ( *user_sub ) ( pevent->user_arg, pevent->chan, - ev_que->evque[ev_que->getix] != EVENTQEMPTY, pfl ); LOCKEVQUE (ev_que); /*