[hornetq-commits] JBoss hornetq SVN: r11769 - in trunk/hornetq-core/src/main/java/org/hornetq/core: server/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-11-25 10:01:32 -0500 (Fri, 25 Nov 2011)
New Revision: 11769

Modified:
   trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java
   trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
Stop replicationEndPoint before stopping the StorageManager.

Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java	2011-11-25 15:01:17 UTC (rev 11768)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java	2011-11-25 15:01:32 UTC (rev 11769)
@@ -292,7 +292,6 @@
       {
          channel.close();
       }
-      storage.stop();
 
       for (ConcurrentMap<Integer, Page> map : pageIndex.values())
       {

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	2011-11-25 15:01:17 UTC (rev 11768)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-11-25 15:01:32 UTC (rev 11769)
@@ -547,6 +547,12 @@
             pagingManager.stop();
          }
 
+            if (replicationEndpoint != null)
+            {
+               replicationEndpoint.stop();
+               replicationEndpoint = null;
+            }
+
          if (!criticalIOError && storageManager != null)
          {
             storageManager.stop();
@@ -558,12 +564,6 @@
             replicationManager = null;
          }
 
-         if (replicationEndpoint != null)
-         {
-            replicationEndpoint.stop();
-            replicationEndpoint = null;
-         }
-
          if (securityManager != null)
          {
             securityManager.stop();