[jboss-svn-commits] JBL Code SVN: r15057 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client.

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

Author: kevin.conner at jboss.com
Date: 2007-09-12 12:29:51 -0400 (Wed, 12 Sep 2007)
New Revision: 15057

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
Log:
Remove redelivery properties after sending: JBESB-1029

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2007-09-12 16:26:15 UTC (rev 15056)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2007-09-12 16:29:51 UTC (rev 15057)
@@ -184,7 +184,12 @@
                     && !service.equals(dlqService)) {
                 message.getProperties().setProperty(MessageStore.CLASSIFICATION, MessageStore.CLASSIFICATION_RDLVR);
                 message.getProperties().setProperty(DELIVER_TO, service);
-                deliverToDeadLetterService(message);
+                try {
+                    deliverToDeadLetterService(message);
+                } finally {
+                    message.getProperties().remove(MessageStore.CLASSIFICATION);
+                    message.getProperties().remove(DELIVER_TO);
+                }
             } else {
                 throw mde;
             }