Change the destroy order of the components in the SynapseConfiguration

Author: sajinieKavindya

modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java

@@ -66,6 +66,7 @@
 import org.apache.synapse.mediators.template.TemplateMediator;
 import org.apache.synapse.message.processor.MessageProcessor;
 import org.apache.synapse.message.processor.impl.AbstractMessageProcessor;
+import org.apache.synapse.message.store.AbstractMessageStore;
 import org.apache.synapse.message.store.MessageStore;
 import org.apache.synapse.registry.Registry;
 import org.apache.synapse.startup.quartz.StartUpController;
@@ -1600,11 +1601,6 @@ public synchronized void destroy(boolean preserverState) {
             }
         }
 
-        // destroy the managed mediators
-        for (ManagedLifecycle seq : getDefinedSequences().values()) {
-            seq.destroy();
-        }
-
         //destroy sequence templates
         for (TemplateMediator seqTemplate : getSequenceTemplates().values()) {
             seqTemplate.destroy();
@@ -1616,11 +1612,6 @@ public synchronized void destroy(boolean preserverState) {
             // from registry. Only un-deployment should remove task from registry. Ref product-ei#1206
             endpoint.destroy(false);
         }
-
-        // destroy the managed endpoints
-        for (Endpoint endpoint : getDefinedEndpoints().values()) {
-            endpoint.destroy();
-        }
 
         // destroy the startups
         for (ManagedLifecycle stp : startups.values()) {
@@ -1657,16 +1648,22 @@ public synchronized void destroy(boolean preserverState) {
 
         // destroy the Message Stores
         for (MessageStore ms : messageStores.values()) {
-            if (ms instanceof AbstractMessageProcessor) {
-                ((AbstractMessageProcessor) ms).destroy(preserverState);
-            } else {
-                ms.destroy();
-            }
+            ms.destroy();
         }
 
         for (API api : apiTable.values()) {
             api.destroy();
         }
+
+        // destroy the managed endpoints
+        for (Endpoint endpoint : getDefinedEndpoints().values()) {
+            endpoint.destroy();
+        }
+
+        // destroy the managed sequences
+        for (ManagedLifecycle seq : getDefinedSequences().values()) {
+            seq.destroy();
+        }
     }
 
     /**