svn commit: r1756600 - in /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server: model/BrokerImpl.java virtualhost/AbstractVirtualHost.java

[lquack]

Author: lquack
Date: Wed Aug 17 09:38:58 2016
New Revision: 1756600

URL: http://svn.apache.org/viewvc?rev=1756600&view=rev
Log:
QPID-7330: [Java Broker] Fix order of PreferenceStore and ExecutorService 
shutdown

Modified:
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java?rev=1756600&r1=1756599&r2=1756600&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
 Wed Aug 17 09:38:58 2016
@@ -359,8 +359,8 @@ public class BrokerImpl extends Abstract
     @StateTransition( currentState = {State.ACTIVE, State.ERRORED}, 
desiredState = State.STOPPED )
     private ListenableFuture<Void> doStop()
     {
-        closePreferenceStore();
         stopPreferenceTaskExecutor();
+        closePreferenceStore();
         return Futures.immediateFuture(null);
     }
 
@@ -708,8 +708,8 @@ public class BrokerImpl extends Abstract
 
         shutdownHouseKeeping();
 
-        closePreferenceStore();
         stopPreferenceTaskExecutor();
+        closePreferenceStore();
 
         _eventLogger.message(BrokerMessages.STOPPED());
 

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1756600&r1=1756599&r2=1756600&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 Wed Aug 17 09:38:58 2016
@@ -579,8 +579,8 @@ public abstract class AbstractVirtualHos
         shutdownHouseKeeping();
         closeNetworkConnectionScheduler();
         closeMessageStore();
-        closePreferenceStore();
         stopPreferenceTaskExecutor();
+        closePreferenceStore();
         stopLogging(new ArrayList<>(getChildren(VirtualHostLogger.class)));
     }
 
@@ -1368,8 +1368,8 @@ public abstract class AbstractVirtualHos
         _dtxRegistry.close();
         shutdownHouseKeeping();
         closeMessageStore();
-        closePreferenceStore();
         stopPreferenceTaskExecutor();
+        closePreferenceStore();
         closeNetworkConnectionScheduler();
         _eventLogger.message(VirtualHostMessages.CLOSED(getName()));
 
@@ -2020,8 +2020,8 @@ public abstract class AbstractVirtualHos
                 shutdownHouseKeeping();
                 closeNetworkConnectionScheduler();
                 closeMessageStore();
-                closePreferenceStore();
                 stopPreferenceTaskExecutor();
+                closePreferenceStore();
                 setState(State.STOPPED);
                 stopLogging(loggers);
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org