You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2009/07/01 18:38:24 UTC
svn commit: r790256 -
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
Author: ruwan
Date: Wed Jul 1 16:38:24 2009
New Revision: 790256
URL: http://svn.apache.org/viewvc?rev=790256&view=rev
Log:
Fixing an issue in the full registry looked up synapse.xml
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java?rev=790256&r1=790255&r2=790256&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java Wed Jul 1 16:38:24 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);
}