Author: borges Date: 2012-02-08 08:31:17 -0500 (Wed, 08 Feb 2012) New Revision: 12093 Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java Log: HORNETQ-820 replicationEndpoint should be stopped before the StorageManager Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2012-02-07 03:21:15 UTC (rev 12092) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2012-02-08 13:31:17 UTC (rev 12093) @@ -571,6 +571,12 @@ pagingManager.stop(); } + if (replicationEndpoint != null) + { + replicationEndpoint.stop(); + replicationEndpoint = null; + } + if (!criticalIOError && storageManager != null) { storageManager.stop(); @@ -582,12 +588,6 @@ replicationManager = null; } - if (replicationEndpoint != null) - { - replicationEndpoint.stop(); - replicationEndpoint = null; - } - if (securityManager != null) { securityManager.stop();