[jboss-svn-commits] JBL Code SVN: r9195 - in labs/jbossesb/trunk: qa/junit/src/org/jboss/soa/esb/actions and 1 other directory.

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

Author: kurt.stam at jboss.com
Date: 2007-01-31 10:13:31 -0500 (Wed, 31 Jan 2007)
New Revision: 9195

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/Aggregator.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SystemPrintln.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.xml
Log:
Fixing message expiration in the Aggregator and addind debug output.

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/Aggregator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/Aggregator.java	2007-01-31 14:26:50 UTC (rev 9194)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/Aggregator.java	2007-01-31 15:13:31 UTC (rev 9195)
@@ -27,7 +27,9 @@
  */
 package org.jboss.soa.esb.actions;
 
+import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.log4j.Logger;
@@ -193,9 +195,18 @@
     {
         long splitterTimeStamp = (Long) message.getProperties().getProperty(MessageRouter.SPLITTER_TIME_STAMP);
         if (timeoutInMillies!=null) {
-            long now = new java.util.Date().getTime();
-            if (splitterTimeStamp + Long.valueOf(timeoutInMillies) > now) {
+            long now = new Date().getTime();
+            long expiration = splitterTimeStamp + Long.valueOf(timeoutInMillies);
+            if (logger.isDebugEnabled()) {
+                DateFormat dateFormat = DateFormat.getTimeInstance();
+                logger.debug("Current time=" + dateFormat.format(new Date(now)) 
+                    + " message expiration=" + dateFormat.format(new Date(expiration)));
+            }
+            if ( now > expiration) {
+                logger.debug("message expired.");
                 return true;
+            } else {
+                logger.debug("message is alive.");
             }
         }
         return false;

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SystemPrintln.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SystemPrintln.java	2007-01-31 14:26:50 UTC (rev 9194)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SystemPrintln.java	2007-01-31 15:13:31 UTC (rev 9195)
@@ -57,7 +57,11 @@
 		if(messageObject instanceof byte[]) {
 			System.out.println(printlnMessage + ": \n[" + format(new String((byte[])messageObject)) + "].");
 		} else {
-			System.out.println(printlnMessage + ": \n[" + format(messageObject.toString()) + "].");
+			if (messageObject!=null) System.out.println(printlnMessage + ": \n[" + format(messageObject.toString()) + "].");
+            for (int i=0; i<message.getAttachment().getUnnamedCount(); i++) {
+                Message attachedMessage = (Message) message.getAttachment().itemAt(i);
+                System.out.println("attachment " + i + ": [" + new String(attachedMessage.getBody().getContents()) + "].");
+            }
 		}
 		
 		return message;

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.java	2007-01-31 14:26:50 UTC (rev 9194)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.java	2007-01-31 15:13:31 UTC (rev 9195)
@@ -88,9 +88,9 @@
 	{
 		try
 		{
-			sendMessage("First Message");
+			sendMessage("<message>First Message</message>");
 			// The second time the rulesEngine should be primed.
-			sendMessage("Second Message");
+			sendMessage("<message>Second Message</message>");
 		}
 		catch (RegistryException re)
 		{
@@ -251,6 +251,7 @@
 	@AfterClass
 	public static void runAfterAllTests() throws Exception
 	{
+        Thread.sleep(4000);
 		// Increase Sleep for debugging
 		_boot.requestEnd();
 		// Give the esb time to finish

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.xml	2007-01-31 14:26:50 UTC (rev 9194)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.xml	2007-01-31 15:13:31 UTC (rev 9195)
@@ -47,8 +47,11 @@
               </listeners>
               <actions>
                   <action class="org.jboss.soa.esb.actions.Aggregator" name="Aggregator">
-                      <property name="timeoutInMillies" value="10000"/>
+                      <property name="timeoutInMillies" value="60000"/>
                   </action>
+                  <action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
+                      <property name="message" value="An aggregated message was created" />
+                  </action>
                   <!-- add transformation action to aggregate the attachments into 1 message -->
               </actions> 
           </service>