[jboss-svn-commits] JBL Code SVN: r10480 - labs/jbossesb/branches/JBESB_4_0_MP1/product/core/listeners/src/org/jboss/soa/esb/listeners/message.

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

Author: kevin.conner at jboss.com
Date: 2007-03-23 12:18:15 -0400 (Fri, 23 Mar 2007)
New Revision: 10480

Modified:
   labs/jbossesb/branches/JBESB_4_0_MP1/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
Log:
Wait for state change instead of sleeping

Modified: labs/jbossesb/branches/JBESB_4_0_MP1/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_0_MP1/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java	2007-03-23 15:44:47 UTC (rev 10479)
+++ labs/jbossesb/branches/JBESB_4_0_MP1/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java	2007-03-23 16:18:15 UTC (rev 10480)
@@ -43,6 +43,7 @@
 import org.jboss.soa.esb.listeners.RegistryUtil;
 import org.jboss.soa.esb.listeners.lifecycle.AbstractThreadedManagedLifecycle;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
+import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleThreadState;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.registry.RegistryException;
 import org.jboss.soa.esb.util.Util;
@@ -277,22 +278,15 @@
 		catch (CourierException e)
 		{
 			_logger.error("Courier Exception", e);
-                        try
+                        if (errorDelay == 0)
                         {
-                            if (errorDelay == 0)
-                            {
-                                errorDelay = MIN_ERROR_DELAY ;
-                            }
-                            else if (errorDelay < MAX_ERROR_DELAY)
-                            {
-                                errorDelay <<= 1 ;
-                            }
-                            Thread.sleep(errorDelay) ;
+                            errorDelay = MIN_ERROR_DELAY ;
                         }
-                        catch (final InterruptedException ie)
+                        else if (errorDelay < MAX_ERROR_DELAY)
                         {
-                            Thread.currentThread().interrupt() ;
+                            errorDelay <<= 1 ;
                         }
+                        waitForRunningStateChange(ManagedLifecycleThreadState.STOPPING, errorDelay) ;
 			return;
 		}