From f813c01258ec5ef3adc8f4790c5c743c2f4b462a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 7 Mar 2011 18:55:13 +0100
Subject: bugfix: discard action did not work under some circumstances

fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217
---
 ChangeLog | 2 ++
 action.c  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 52f0528d..5f9b06c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---------------------------------------------------------------------------
 Version 5.7.8  [V5-BETA] (rgerhards), 2011-03-??
+- bugfix: discard action did not work under some circumstances
+  fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217
 - bugfix: file descriptor leak in gnutls netstream driver
   fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=222
 ---------------------------------------------------------------------------
diff --git a/action.c b/action.c
index 36830577..c9e5e095 100644
--- a/action.c
+++ b/action.c
@@ -1481,7 +1481,8 @@ helperSubmitToActionQComplexBatch(action_t *pAction, batch_t *pBatch)
 
 	DBGPRINTF("Called action(complex case), logging to %s\n", module.GetStateName(pAction->pMod));
 	for(i = 0 ; i < batchNumMsgs(pBatch) && !*(pBatch->pbShutdownImmediate) ; ++i) {
-		if(pBatch->pElem[i].bFilterOK) {
+		if(   pBatch->pElem[i].bFilterOK
+                   && pBatch->pElem[i].state != BATCH_STATE_DISC) {
 			doActionCallAction(pAction, (msg_t*)(pBatch->pElem[i].pUsrp));
 		}
 	}
-- 
cgit