Author: ruwan Date: Wed Jul 1 09:37:10 2009 New Revision: 40562 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=40562
Log: Fixing an issue in the full registry looked up synapse.xml Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java?rev=40562&r1=40561&r2=40562&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java Wed Jul 1 09:37:10 2009 @@ -27,6 +27,7 @@ import org.apache.synapse.Startup; import org.apache.synapse.SynapseConstants; import org.apache.synapse.SynapseException; +import org.apache.synapse.registry.Registry; import org.apache.synapse.aspects.AspectConfiguration; import org.apache.synapse.aspects.AspectConfigurable; import org.apache.synapse.eventing.SynapseEventSource; @@ -102,12 +103,16 @@ } } + Registry localConfigReg = config.getRegistry(); if (config.getLocalRegistry().isEmpty() && config.getProxyServices().isEmpty() && - rootSequence.getList().isEmpty() && config.getRegistry() != null) { - OMNode remoteConfigNode = config.getRegistry().lookup("synapse.xml"); + rootSequence.getList().isEmpty() && localConfigReg != null) { + OMNode remoteConfigNode = localConfigReg.lookup("synapse.xml"); try { config = XMLConfigurationBuilder.getConfiguration(SynapseConfigUtils .getStreamSource(remoteConfigNode).getInputStream()); + if (config.getRegistry() == null) { + config.setRegistry(localConfigReg); + } } catch (XMLStreamException xse) { throw new SynapseException("Problem loading remote synapse.xml ", xse); } _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
