svn commit: r696203 - /servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java

[gnodet]

Author: gnodet
Date: Wed Sep 17 01:58:10 2008
New Revision: 696203

URL: http://svn.apache.org/viewvc?rev=696203&view=rev
Log:
SM-1579: The registry should be shutdown before the flow so that existing 
exchanges can be correctly processed before stopping

Modified:
    
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java

Modified: 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java?rev=696203&r1=696202&r2=696203&view=diff
==============================================================================
--- 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
 (original)
+++ 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
 Wed Sep 17 01:58:10 2008
@@ -715,10 +715,8 @@
             autoDeployService.shutDown();
             deploymentService.shutDown();
             installationService.shutDown();
-            // Shutdown broker before registry to avoid the JCA/JMS flow to 
send
-            // lots of messages when components and endpoints are stopped.
-            broker.shutDown();
             shutdownRegistry();           
+            broker.shutDown();
             shutdownServices();
             clientFactory.shutDown();
             environmentContext.shutDown();