[jboss-svn-commits] JBL Code SVN: r11408 - in labs/jbossesb/trunk/product/core/rosetta/src/org/jboss: soa/esb/couriers/filter and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2007-04-27 06:50:11 -0400 (Fri, 27 Apr 2007)
New Revision: 11408

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/metadata/MetaDataFilter.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/filter/FilterManager.java
Log:
try to be more defensive in filters.

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/metadata/MetaDataFilter.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/metadata/MetaDataFilter.java	2007-04-27 10:39:34 UTC (rev 11407)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/metadata/MetaDataFilter.java	2007-04-27 10:50:11 UTC (rev 11408)
@@ -53,6 +53,9 @@
 {
 	public Message onOutput (Message msg) throws CourierException
 	{
+		if (msg == null)
+			return null;
+		
 		EPR destination = msg.getHeader().getCall().getTo();
 		Environment.Transports type = Environment.Transports.JMS;
 		String name = null;
@@ -74,6 +77,10 @@
 			{
 				throw new CourierException(ex);
 			}
+			catch (Exception ex)
+			{
+				throw new CourierException(ex);
+			}
 		}
 		else
 		{
@@ -94,6 +101,10 @@
 				{
 					throw new CourierException(ex);
 				}
+				catch (Exception ex)
+				{
+					throw new CourierException(ex);
+				}
 			}		
 			else
 			{
@@ -124,6 +135,9 @@
 	
 	public Message onInput (Message msg) throws CourierException
 	{
+		if (msg == null)
+			return null;
+		
 		msg.getProperties().setProperty(Environment.MESSAGE_EXIT_TIME, Calendar.getInstance().getTime().toString());
 		
 		return msg;

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/filter/FilterManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/filter/FilterManager.java	2007-04-27 10:39:34 UTC (rev 11407)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/filter/FilterManager.java	2007-04-27 10:50:11 UTC (rev 11408)
@@ -67,14 +67,15 @@
 	
 	public Message doOutputWork (Message msg) throws CourierException
 	{
-//		if (_filters == null)
-//			return msg;
-//		
-//		for (int i = 0; i < _filters.length; i++)
-//		{
-//			msg = _filters[i].onOutput(msg);
-//		}
+		if (_filters == null)
+			return msg;
 		
+		for (int i = 0; i < _filters.length; i++)
+		{
+			if (_filters[i] != null)
+				msg = _filters[i].onOutput(msg);
+		}
+		
 		return msg;
 	}
 	
@@ -94,7 +95,8 @@
 		
 		for (int i = 0; i < _filters.length; i++)
 		{
-			msg = _filters[i].onInput(msg);
+			if (_filters[i] != null)
+				msg = _filters[i].onInput(msg);
 		}
 		
 		return msg;