Author: ruwan
Date: Thu Mar 22 22:49:19 2007
New Revision: 521595
URL: http://svn.apache.org/viewvc?view=rev&rev=521595
Log:
fixing the synapse.xml picking from the registry in absence of any elements in
local configuration
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java?view=diff&rev=521595&r1=521594&r2=521595
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
Thu Mar 22 22:49:19 2007
@@ -110,8 +110,8 @@
} catch (IOException ignore) {}
}
- if (config.getLocalRegistry().isEmpty() && config
- .getProxyServices().isEmpty() && config.getRegistry() != null)
{
+ if (config.getLocalRegistry().isEmpty() &&
config.getProxyServices().isEmpty() &&
+ rootSequence.getList().isEmpty() && config.getRegistry() !=
null) {
OMNode remoteConfigNode =
config.getRegistry().lookup("synapse.xml");
config =
getConfiguration(Util.getStreamSource(remoteConfigNode).getInputStream());
}
@@ -122,6 +122,10 @@
} else {
config.addSequence(rootSequence.getName(), rootSequence);
}
+ } else if (!rootSequence.getList().isEmpty()) {
+ handleException("Invalid Synapse Configuration : Conflict in
resolving the \"main\" " +
+ "mediator\n\tSynapse Configuration cannot have sequence
named \"main\" and " +
+ "toplevel mediators simultaniously");
}
if (config.getFaultSequence() == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
