svn commit: r768732 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: Axis2SynapseController.java ServerManager.java config/SynapseConfiguration.java

[ruwan]

Author: ruwan
Date: Sun Apr 26 17:56:48 2009
New Revision: 768732

URL: http://svn.apache.org/viewvc?rev=768732&view=rev
Log:
Applying the patch from Eric (SYNAPSE-536)

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=768732&r1=768731&r2=768732&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
 Sun Apr 26 17:56:48 2009
@@ -35,6 +35,7 @@
 import org.apache.axis2.phaseresolver.PhaseMetadata;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.commons.util.RMIRegistryController;
 import 
org.apache.synapse.commons.util.datasource.DataSourceInformationRepositoryHelper;
 import org.apache.synapse.commons.util.jmx.JmxInformation;
 import org.apache.synapse.commons.util.jmx.JmxInformationFactory;
@@ -141,6 +142,7 @@
                 }
 
                 stopJmxAdapter();
+                RMIRegistryController.getInstance().shutDown();
 
                 // we need to call this method to clean the temp files we 
created.
                 if (configurationContext != null) {

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java?rev=768732&r1=768731&r2=768732&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
 Sun Apr 26 17:56:48 2009
@@ -248,12 +248,13 @@
                 configurationInformation);
 
         if (serverState == ServerState.INITIALIZED || serverState == 
ServerState.STOPPED) {
-            // destroy the SynapseController
-            synapseController.destroy();
 
             // unregister the ServerManager MBean
             unRegisterMBean();
 
+            // destroy the SynapseController
+            synapseController.destroy();
+
             // mark as destroyed
             chanageState(ServerState.UNDETERMINED);
         } else {

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=768732&r1=768731&r2=768732&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
 Sun Apr 26 17:56:48 2009
@@ -25,7 +25,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.*;
 import org.apache.synapse.eventing.SynapseEventSource;
-import org.apache.synapse.commons.util.RMIRegistryController;
 import org.apache.synapse.commons.util.datasource.InMemoryDataSourceRepository;
 import 
org.apache.synapse.commons.util.datasource.JNDIBasedDataSourceRepository;
 import org.apache.synapse.task.TaskDescriptionRepository;
@@ -877,7 +876,6 @@
         
         // clear session information used for SA load balancing
         try {
-            RMIRegistryController.getInstance().shutDown();
             SALSessions.getInstance().reset();
             InMemoryDataSourceRepository.getInstance().clear();
             JNDIBasedDataSourceRepository registry = 
JNDIBasedDataSourceRepository.getInstance();