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

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

Author: kevin.conner at jboss.com
Date: 2007-10-10 15:11:11 -0400 (Wed, 10 Oct 2007)
New Revision: 15729

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
Log:
Fixed CCE: JBESB-1144

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2007-10-10 18:23:42 UTC (rev 15728)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2007-10-10 19:11:11 UTC (rev 15729)
@@ -216,6 +216,7 @@
      * @param messageMap
      * @return the aggregated message
      */
+    @SuppressWarnings("unchecked")
     private Message createAggregateMessage(String uuId, ConcurrentHashMap<String, Message> messageMap) 
     {
         //Create an aggregated message
@@ -225,7 +226,7 @@
             //Push additional AggregatorTags onto the new message, so we can aggregate in case of nested splits.
             //Only need to get it from the first message, should be the same for the others.
             if (isFirstTime) {
-                ArrayList aggregatorTags = (ArrayList) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
+                ArrayList<String> aggregatorTags = (ArrayList<String>) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
                 if (aggregatorTags!=null && aggregatorTags.size()>0) {
                     aggregatedMessage.getProperties().setProperty(Aggregator.AGGEGRATOR_TAG, aggregatorTags);
                 }
@@ -280,6 +281,7 @@
         private final Condition terminateCondition = terminateLock.newCondition() ;
         private boolean terminated ; 
         
+        @SuppressWarnings("unchecked")
         public void run() {
             boolean running = true ;
             while(running) {
@@ -291,9 +293,8 @@
                         if (isTimedOut(message)) {
                             //We found a timed-out message. Let's go notify ourselves about by resending a message,
                             //it if we haven't done so already
-                            String aggregatorTag = (String) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
-                            String[] tag = aggregatorTag.split(":");
-                            String uuId = tag[0];
+                            ArrayList<String> aggregatorTag = (ArrayList<String>) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
+                            String uuId = aggregatorTag.get(0);
                             if (!_notified.contains(uuId)) {
                                 _notified.add(uuId);
                                 logger.debug("Found timeout message.");