[hornetq-commits] JBoss hornetq SVN: r11713 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-11-18 12:43:25 -0500 (Fri, 18 Nov 2011)
New Revision: 11713

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java
Log:
https://issues.jboss.org/browse/JBPAPP-7521 - NPE on filter==null passed on destroy queue

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java	2011-11-18 17:32:29 UTC (rev 11712)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java	2011-11-18 17:43:25 UTC (rev 11713)
@@ -115,7 +115,7 @@
          while (iter.hasNext())
          {
             MessageReference ref = iter.next();
-            if (filter.match(ref.getMessage()))
+            if (filter == null || filter.match(ref.getMessage()))
             {
                iter.remove();
                refs.add(ref);