Author: ruwan Date: Fri May 1 14:01:58 2009 New Revision: 34617 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=34617
Log: fix (sync up) Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.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=34617&r1=34616&r2=34617&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 Fri May 1 14:01:58 2009 @@ -99,7 +99,7 @@ log.info("Initializing Synapse at : " + new Date()); this.serverConfigurationInformation = serverConfigurationInformation; - + /* If no system property for the JMX agent is specified from outside, use a default one to show all MBeans (including the Axis2-MBeans) within the Synapse tree */ if (System.getProperty(JMX_AGENT_NAME) == null) { @@ -142,7 +142,8 @@ public void destroy() { try { - if (serverConfigurationInformation.isCreateNewInstance()) { // only if we have created the server + // only if we have created the server + if (serverConfigurationInformation.isCreateNewInstance()) { // destroy listener manager if (listenerManager != null) { @@ -206,12 +207,12 @@ /* if JMX Adapter has been configured and started, output usage information rather at the end of the startup process to make it more obvious */ if (jmxAdapter != null && jmxAdapter.isRunning()) { - log.info("Management using JMX available via: " + log.info("Management using JMX available via: " + jmxAdapter.getJmxInformation().getJmxUrl()); } } } - + /** * {...@inheritdoc} */ @@ -276,6 +277,7 @@ synapseHandlers.add(handler.getHandlerDesc()); } } + for (HandlerDescription handlerMD : synapseHandlers) { inPhase.removeHandler(handlerMD); } @@ -328,10 +330,9 @@ synapseEnvironment = new Axis2SynapseEnvironment( configurationContext, synapseConfiguration); MessageContextCreatorForAxis2.setSynEnv(synapseEnvironment); - + Parameter synapseEnvironmentParameter = new Parameter( SynapseConstants.SYNAPSE_ENV, synapseEnvironment); - try { configurationContext.getAxisConfiguration().addParameter(synapseEnvironmentParameter); } catch (AxisFault e) { @@ -386,7 +387,6 @@ // set the Synapse configuration into the Axis2 configuration Parameter synapseConfigurationParameter = new Parameter( SynapseConstants.SYNAPSE_CONFIG, synapseConfiguration); - try { configurationContext.getAxisConfiguration().addParameter(synapseConfigurationParameter); } catch (AxisFault e) { @@ -512,7 +512,7 @@ // SynapseServer shutdown hook. listenerManager.setShutdownHookRequired(false); } - + } catch (Throwable t) { handleFatal("Failed to create a new Axis2 instance...", t); } _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
