Author: asankha
Date: Thu Nov 2 20:10:04 2006
New Revision: 470652
URL: http://svn.apache.org/viewvc?view=rev&rev=470652
Log:
Comitting for Ruwan
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java?view=diff&rev=470652&r1=470651&r2=470652
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
Thu Nov 2 20:10:04 2006
@@ -177,21 +177,20 @@
if(name != null && value != null) {
if(globalProps.containsKey(name)) {
log.warn("Overiding the global property with name : " + name);
- } else {
- if(value.getType() == Property.SRC_TYPE) {
- try {
- URLConnection urlc = value.getSrc().openConnection();
- XMLStreamReader parser =
XMLInputFactory.newInstance().createXMLStreamReader(urlc.getInputStream());
- StAXOMBuilder builder = new StAXOMBuilder(parser);
- value.setValue(builder.getDocumentElement());
- } catch (IOException e) {
- handleException("Can not read from the source : " +
value.getSrc());
- } catch (XMLStreamException e) {
- handleException("Can not load the source property : "
+ value.getName());
- }
+ }
+ if(value.getType() == Property.SRC_TYPE) {
+ try {
+ URLConnection urlc = value.getSrc().openConnection();
+ XMLStreamReader parser =
XMLInputFactory.newInstance().createXMLStreamReader(urlc.getInputStream());
+ StAXOMBuilder builder = new StAXOMBuilder(parser);
+ value.setValue(builder.getDocumentElement());
+ } catch (IOException e) {
+ handleException("Can not read from the source : " +
value.getSrc());
+ } catch (XMLStreamException e) {
+ handleException("Can not load the source property : " +
value.getName());
}
- globalProps.put(name, value);
}
+ globalProps.put(name, value);
} else {
log.error("Name and the value of the property cannot be null");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
