[jboss-svn-commits] JBL Code SVN: r7470 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/listeners/message 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-08 10:39:20 -0500 (Wed, 08 Nov 2006)
New Revision: 7470

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListener.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java
Log:
Fixing test

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListener.java	2006-11-08 15:25:29 UTC (rev 7469)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListener.java	2006-11-08 15:39:20 UTC (rev 7470)
@@ -93,8 +93,8 @@
         				try  { 
         					_logger.debug("Replying to caller");
         					//TODO For now it's ok to assume it's JMS. But going forward this needs to be fixed
-        					JMSEpr replyTo = new JMSEpr(message.getHeader().getCall().getReplyTo());
-        					if (replyTo!=null) {
+        					if (message.getHeader().getCall()!=null && message.getHeader().getCall().getReplyTo()!=null) {
+        						JMSEpr replyTo = new JMSEpr(message.getHeader().getCall().getReplyTo());
         						CourierFactory.getCourier(replyTo).deliver(message);
         					} else {
         						_logger.log(Priority.ERROR, "Unable to reply to caller. Could not optain replyTo EPR.");

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-08 15:25:29 UTC (rev 7469)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java	2006-11-08 15:39:20 UTC (rev 7470)
@@ -143,7 +143,7 @@
 			} //add and test your own database..
 			
 			//Get the registry-schema create scripts
-			String sqlDir = TestEnvironmentUtil.getUserDir("product","..") + "install/jUDDI-registry/sql/" + database + "/";
+			String sqlDir = TestEnvironmentUtil.getUserDir("product","../product") + "install/jUDDI-registry/sql/" + database + "/";
 			//Drop what is there now, if exists. We want to start fresh.
 			String sqlDropCmd      = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
 			String sqlCreateCmd    = FileUtil.readTextFile(new File(sqlDir + "create_database.sql"));