[jboss-cvs] JBoss Messaging SVN: r2031 - trunk/src/main/org/jboss/jms/server/endpoint.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-01-24 02:44:11 -0500 (Wed, 24 Jan 2007)
New Revision: 2031

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
Log:
If delivery expires do not delivery it to client!



Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-01-24 03:29:10 UTC (rev 2030)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-01-24 07:44:11 UTC (rev 2031)
@@ -175,12 +175,13 @@
       if (!clientAccepting)
       {
          if (trace) { log.trace(this + "'s client is NOT accepting messages!"); }
+         
          return null;
       }
       
       if (ref.isExpired())
       {
-         SimpleDelivery delivery = new SimpleDelivery(observer, ref);
+         SimpleDelivery delivery = new SimpleDelivery(observer, ref, true);
          
          try
          {
@@ -190,6 +191,8 @@
          {
             log.error("Failed to expire delivery: " + delivery, t);
          }
+         
+         return delivery;
       }
         
       synchronized (startStopLock)