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

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

Author: tcunning
Date: 2012-11-15 00:26:06 -0500 (Thu, 15 Nov 2012)
New Revision: 38245

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
Log:
JBESB-3876
interceptEnding was mistakenly being called at the end of each action rather
than at the end of the service.   Move that call to the when a service has
successfully completed.


Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2012-11-09 14:20:14 UTC (rev 38244)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2012-11-15 05:26:06 UTC (rev 38245)
@@ -438,8 +438,10 @@
 			{
 				LOGGER.debug("pipeline process for message: "+message.getHeader());
 			}
-
-			return processPipeline(message, getSecurityContext(message));
+			
+			boolean result = processPipeline(message, getSecurityContext(message));
+			InterceptorManager.getInstance().interceptEnding(message, config);
+			return result;
 		}
 		else
 		{
@@ -714,8 +716,6 @@
 					final long procTime = System.nanoTime() - actionStart;
 					serviceMessageCounter.update(new ActionStatusBean(procTime, count, message,
 						ActionStatusBean.ACTION_SENT, serviceMessageCounter.getObjectName().toString()));
-
-					InterceptorManager.getInstance().interceptEnding(message, config);
 					
 					if (currentMessage == null)
 					{
@@ -758,6 +758,7 @@
 				{
 					notifySuccess(messages);
 					long procTime = System.nanoTime() - start;
+
 					MessageCounterStatistics.getMessageCounterStatistics().update(new MessageStatusBean(procTime, message,
 						MessageStatusBean.MESSAGE_SENT));
 					result = true;