[jboss-svn-commits] JBL Code SVN: r16408 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions.

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

Author: mark.little at jboss.com
Date: 2007-11-07 10:41:37 -0500 (Wed, 07 Nov 2007)
New Revision: 16408

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1253

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2007-11-07 11:45:06 UTC (rev 16407)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2007-11-07 15:41:37 UTC (rev 16408)
@@ -38,12 +38,15 @@
 
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.Service;
 import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.client.ServiceInvoker;
 import org.jboss.soa.esb.couriers.Courier;
 import org.jboss.soa.esb.couriers.CourierFactory;
 import org.jboss.soa.esb.couriers.CourierUtil;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
 import org.jboss.soa.esb.services.registry.Registry;
@@ -285,6 +288,9 @@
         public void run() {
             boolean running = true ;
             while(running) {
+            	Service theService = new Service(serviceCategoryName, serviceName);
+            	ServiceInvoker theServiceInvoker = null;
+            	
                 //no need to check if no timeout is set
                 if (timeoutInMillies!=null) {
                     for (ConcurrentHashMap< String, Message > messageMap : _aggregatedMessageMap.values()) {
@@ -299,16 +305,10 @@
                                 _notified.add(uuId);
                                 logger.debug("Found timeout message.");
                                 try {
-                                    EPR epr = registry.findEPR(serviceCategoryName, serviceName);
-                                    Courier courier = CourierFactory.getCourier(epr);
-                                    try
-                                    {
-                                        courier.deliver(message);
-                                    }
-                                    finally
-                                    {
-                                        CourierUtil.cleanCourier(courier) ;
-                                    }
+                                	if (theServiceInvoker == null)
+                                    	theServiceInvoker = new ServiceInvoker(theService);
+                                	
+                                	theServiceInvoker.deliverAsync(message);
                                 } catch (Exception e) {
                                     logger.error(e.getMessage(), e);
                                     //If we can't notify then drop this data