[jboss-cvs] JBossAS SVN: r66865 - branches/JBPAPP_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/dlq.

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

Author: wolfc
Date: 2007-11-08 09:58:36 -0500 (Thu, 08 Nov 2007)
New Revision: 66865

Modified:
   branches/JBPAPP_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/dlq/GenericDLQHandler.java
Log:
JBPAPP-409: merged 66864

Modified: branches/JBPAPP_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/dlq/GenericDLQHandler.java
===================================================================
--- branches/JBPAPP_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/dlq/GenericDLQHandler.java	2007-11-08 14:57:31 UTC (rev 66864)
+++ branches/JBPAPP_4_2/connector/src/main/org/jboss/resource/adapter/jms/inflow/dlq/GenericDLQHandler.java	2007-11-08 14:58:36 UTC (rev 66865)
@@ -87,9 +87,13 @@
             count = incrementResentCounter(id);
          }
          
-         if (count > maxResent)
+         int max = maxResent;
+         if (msg.propertyExists(JMS_JBOSS_REDELIVERY_LIMIT))
+            max = msg.getIntProperty(JMS_JBOSS_REDELIVERY_LIMIT);
+         
+         if (count > max)
          {
-            warnDLQ(msg, count, maxResent);
+            warnDLQ(msg, count, max);
             clearResentCounter(id);
             return true;
          }