Author: ruwan Date: Sun Apr 26 20:05:06 2009 New Revision: 34152 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=34152
Log: patch from Eric to the shutdown order issue Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/ServerManager.java branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=34152&r1=34151&r2=34152&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java Sun Apr 26 20:05:06 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: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/ServerManager.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/ServerManager.java?rev=34152&r1=34151&r2=34152&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/ServerManager.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/ServerManager.java Sun Apr 26 20:05:06 2009 @@ -248,11 +248,12 @@ 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); Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=34152&r1=34151&r2=34152&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java Sun Apr 26 20:05:06 2009 @@ -879,7 +879,6 @@ // clear session information used for SA load balancing try { - RMIRegistryController.getInstance().shutDown(); SALSessions.getInstance().reset(); InMemoryDataSourceRepository.getInstance().clear(); JNDIBasedDataSourceRepository registry = JNDIBasedDataSourceRepository.getInstance(); _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
