Author: rajdavies Date: Mon Nov 13 11:54:40 2006 New Revision: 474469 URL: http://svn.apache.org/viewvc?view=rev&rev=474469 Log: check that Queue messages aren't acknowledged before applying a filter
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java?view=diff&rev=474469&r1=474468&r2=474469 ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java Mon Nov 13 11:54:40 2006 @@ -58,7 +58,9 @@ public boolean matches(MessageEvaluationContext message) throws JMSException{ try{ - return matchesForwardingFilter(message.getMessage()); + //for Queues - the message can be acknowledged and dropped whilst still + //in the dispatch loop + return message.getMessage() != null && matchesForwardingFilter(message.getMessage()); }catch(IOException e){ throw JMSExceptionSupport.create(e); }