[jboss-svn-commits] JBL Code SVN: r13412 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter.

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

Author: mark.little at jboss.com
Date: 2007-07-12 14:44:57 -0400 (Thu, 12 Jul 2007)
New Revision: 13412

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java
Log:
http://jira.jboss.com/jira/browse/JBESB-682

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java	2007-07-12 18:43:15 UTC (rev 13411)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java	2007-07-12 18:44:57 UTC (rev 13412)
@@ -70,6 +70,8 @@
 	    ConfigTree config = (ConfigTree) params
 		    .get(Environment.GATEWAY_CONFIG);
 
+	    String notPresent = "not present";  // Ugly, but needed because 'default value of null' in ListenerUtil means throw exception!
+	    
 	    if (config != null)
 	    {
 		try
@@ -77,7 +79,7 @@
         		String url = ListenerUtil.obtainAtt(config, JDBCEpr.URL_TAG,
         			null);
         
-        		if (url != null)
+        		if ((url != null) && (url != notPresent))
         		    msg.getProperties().setProperty(
         			    Environment.ORIGINAL_URL_PROP, url);
 		}
@@ -89,9 +91,9 @@
 		try
 		{
         		String queueName = ListenerUtil.obtainAtt(config,
-        			JMSEpr.DESTINATION_NAME_TAG, null);
+        			JMSEpr.DESTINATION_NAME_TAG, "not present");
         
-        		if (queueName != null)
+        		if ((queueName != null) && (queueName != notPresent))
         		    msg.getProperties()
         			    .setProperty(
         				    Environment.ORIGINAL_QUEUE_NAME_MSG_PROP,