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

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

Author: kevin.conner at jboss.com
Date: 2007-10-31 14:44:06 -0400 (Wed, 31 Oct 2007)
New Revision: 16214

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
Log:
Tidy up warning message: JBESB-1284

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2007-10-31 17:59:49 UTC (rev 16213)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2007-10-31 18:44:06 UTC (rev 16214)
@@ -92,9 +92,9 @@
 	private boolean oneWay ;
 	
         /**
-         * The flag indicating whether missing ReplyTo/FaultTo headers should emit a warning.
+         * The flag indicating whether we are using implicit or explicit processing.
          */
-	private boolean warnResponses ;
+	private boolean defaultProcessing ;
 	
 	/**
 	 * public constructor
@@ -113,21 +113,21 @@
 
 		final String mep = config.getAttribute(ListenerTagNames.MEP_ATTRIBUTE_TAG) ;
 		final boolean oneWay ;
-		final boolean warnResponses ;
+		final boolean defaultProcessing ;
 		if (mep == null)
 		{
 		    oneWay = false ;
-		    warnResponses = true ;
+		    defaultProcessing = true ;
 		}
 		else if (ListenerTagNames.MEP_ONE_WAY.equals(mep))
 		{
 		    oneWay = true ;
-		    warnResponses = false ;
+		    defaultProcessing = false ;
 		}
 		else if (ListenerTagNames.MEP_REQUEST_RESPONSE.equals(mep))
 		{
 		    oneWay = false ;
-		    warnResponses = false ;
+		    defaultProcessing = false ;
 		}
 		else
 		{
@@ -136,10 +136,10 @@
 		
 		if (LOGGER.isDebugEnabled())
 		{
-		    LOGGER.debug("Using mep: " + mep + ", oneWay: " + oneWay + ", warnResponses: " + warnResponses) ;
+		    LOGGER.debug("Using mep: " + mep + ", oneWay: " + oneWay + ", defaultProcessing: " + defaultProcessing) ;
 		}
                 this.oneWay = oneWay ;
-                this.warnResponses = warnResponses ;
+                this.defaultProcessing = defaultProcessing ;
 		
 		final ConfigTree[] actionList = config
 				.getChildren(ListenerTagNames.ACTION_ELEMENT_TAG);
@@ -375,7 +375,7 @@
                             {
                                 replyTo(callDetails, currentMessage);
                             }
-                            else
+                            else if (!defaultProcessing)
                             {
                                 LOGGER.warn("No response message for RequestResponse mep! " + callDetails);
                             }
@@ -431,7 +431,7 @@
 	{
 		if (!DefaultReplyTo.initialiseReply(message, callDetails))
 		{
-		    if (warnResponses)
+		    if (defaultProcessing)
 		    {
 			LOGGER.warn("No reply to address defined for reply message! " + callDetails);
 			sendToDLQ(callDetails, message, MessageType.reply) ;
@@ -459,7 +459,7 @@
 	{
 		if (!DefaultFaultTo.initialiseReply(message, callDetails))
 		{
-		    if (warnResponses)
+		    if (defaultProcessing)
 		    {
 			LOGGER.warn("No fault address defined for fault message! " + callDetails);
 			sendToDLQ(callDetails, message, MessageType.fault) ;