[jboss-svn-commits] JBL Code SVN: r7374 - in labs/jbossesb/trunk: product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr qa/junit/src/org/jboss/soa/esb/listeners/message

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

Author: kurt.stam at jboss.com
Date: 2006-11-03 13:58:56 -0500 (Fri, 03 Nov 2006)
New Revision: 7374

Modified:
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java
Log:
Adding DeliverMessage flag in the router

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java	2006-11-03 18:37:13 UTC (rev 7373)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java	2006-11-03 18:58:56 UTC (rev 7374)
@@ -71,7 +71,7 @@
 			//Now route there, later we will implement an option to place a callback.
 			destinationServices = (List) workingMemory.getGlobal("destinationServices");
 			logger.log(Priority.DEBUG, "Destination Services List: " + destinationServices);
-			Boolean deliverMessages = (Boolean) message.getBody().get(MessageRouter.DELIVER_MESSAGES);
+			Boolean deliverMessages = (Boolean) message.getProperties().getProperty(MessageRouter.DELIVER_MESSAGES);
 			//Only actuall deliver the message if this is set in the message
 			if (Boolean.TRUE.equals(deliverMessages)) {
 				deliverMessages(destinationServices, message);

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java	2006-11-03 18:37:13 UTC (rev 7373)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java	2006-11-03 18:58:56 UTC (rev 7374)
@@ -45,6 +45,7 @@
 import org.jboss.soa.esb.services.registry.Registry;
 import org.jboss.soa.esb.services.registry.RegistryException;
 import org.jboss.soa.esb.services.registry.RegistryFactory;
+import org.jboss.soa.esb.services.routing.MessageRouter;
 import org.jboss.soa.esb.services.util.FileUtil;
 import org.jboss.soa.esb.util.TestUtil;
 import org.junit.AfterClass;
@@ -94,7 +95,7 @@
 	private static void sendMessage(String body) throws Exception{		
 		Message msg = MessageFactory.getInstance().getMessage();
 		msg.getBody().setContents(body.getBytes());
-		//msg.getBody().add(MessageRouter.DELIVER_MESSAGES, Boolean.TRUE);
+		msg.getProperties().setProperty(MessageRouter.DELIVER_MESSAGES, Boolean.TRUE);
 		try {
 			Registry registry = RegistryFactory.getRegistry();
 			Collection<EPR> eprs = registry.findEPRs(SERVICE_CATEGORY_NAME, SERVICE_NAME);
@@ -189,8 +190,10 @@
 	 */
 	@AfterClass
 	public static void runAfterAllTests() throws Exception {
+		//Increase Sleep for debugging
+		Thread.sleep(200);
 		_proc.requestEnd();
-//		give the controller time to finish
+        //Give the controller time to finish
 		Thread.sleep(2000);
 		EsbListenerController.State oS = _proc.getState();
 		System.out.println("Exit state = "+oS.toString());