[jboss-svn-commits] JBL Code SVN: r7389 - labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message

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

Author: kurt.stam at jboss.com
Date: 2006-11-03 16:14:09 -0500 (Fri, 03 Nov 2006)
New Revision: 7389

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListener.java
Log:
handling exceptions

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-03 21:10:11 UTC (rev 7388)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListener.java	2006-11-03 21:14:09 UTC (rev 7389)
@@ -82,23 +82,24 @@
 		    		long lwait = _controller.millisToWait();
 		    		Message message = (lwait > 0 ) ? receiveEsbMessage(100) : null;
 		        	if (null!=message) {
-		        		if (ruleSet!=null) {
-		        			_logger.log(Priority.DEBUG, "Sending message to the Content Based Router.");
-		        			Collection<String> destinationServices = cbr.route(ruleSet, message);
-		        			if (Boolean.FALSE.equals(message.getProperties().getProperty(MessageRouter.DELIVER_MESSAGES))) {
-		        				message.getBody().add(MessageRouter.ROUTING_DESTINATION_SERVICE_LIST, destinationServices);
-		        				try  { 
-		        					EPR reply = message.getHeader().getCall().getReplyTo();
-		        					CourierFactory.getCourier(reply).deliver(message);
-		        				} catch (URISyntaxException use) {
-		        					_logger.log(Priority.ERROR, "Unable to reply to caller. "+ use.getLocalizedMessage(), use);
-		        				} catch (CourierException ce) {
-		        					_logger.log(Priority.ERROR, "Unable to reply to caller. "+ ce.getLocalizedMessage(), ce);
-		        				}
-		        			} else {
-		                    	_logger.log(Priority.ERROR, "No Ruleset could not be obtained, neither from the configuration nor from the message.");
-		                    }
-		        		}
+	        			_logger.log(Priority.DEBUG, "Sending message to the Content Based Router.");
+	        			Collection<String> destinationServices = cbr.route(ruleSet, message);
+	        			if (Boolean.FALSE.equals(message.getProperties().getProperty(MessageRouter.DELIVER_MESSAGES))) {
+	        				message.getBody().add(MessageRouter.ROUTING_DESTINATION_SERVICE_LIST, destinationServices);
+	        				try  { 
+	        					_logger.debug("Replying to caller");
+	        					EPR replyTo = message.getHeader().getCall().getReplyTo();
+	        					if (replyTo!=null) {
+	        						CourierFactory.getCourier(replyTo).deliver(message);
+	        					} else {
+	        						_logger.log(Priority.ERROR, "Unable to reply to caller. Could not optain replyTo EPR");
+	        					}
+	        				} catch (URISyntaxException use) {
+	        					_logger.log(Priority.ERROR, "Unable to reply to caller. "+ use.getLocalizedMessage(), use);
+	        				} catch (CourierException ce) {
+	        					_logger.log(Priority.ERROR, "Unable to reply to caller. "+ ce.getLocalizedMessage(), ce);
+	        				}
+	        			}
 	        		}
 		        }
 		    	_controller.unRegister(_eprCategoryName, _eprName, _epr);