Author: hiranya
Date: Thu Aug 8 23:43:10 2013
New Revision: 1512100
URL: http://svn.apache.org/r1512100
Log:
Passing top level synapse properties to the AbstractRegistry, so SYNAPSE_HOME
can be resolved proeprly by the subclasses. Fix applied from SYNAPSE-774
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java?rev=1512100&r1=1512099&r2=1512100&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
Thu Aug 8 23:43:10 2013
@@ -78,7 +78,8 @@ public class RegistryFactory {
private static Properties getProperties(OMElement elem, Properties
topLevelProps) {
Iterator params = elem.getChildrenWithName(PARAMETER_Q);
- Properties props = new Properties(topLevelProps);
+ Properties props = new Properties();
+ props.putAll(topLevelProps);
while (params.hasNext()) {
Object o = params.next();
if (o instanceof OMElement) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java?rev=1512100&r1=1512099&r2=1512100&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
Thu Aug 8 23:43:10 2013
@@ -27,7 +27,6 @@ import org.apache.synapse.config.XMLToOb
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.mediators.base.SequenceMediator;
-import java.util.Map;
import java.util.Properties;
/**
@@ -42,7 +41,7 @@ public abstract class AbstractRegistry i
/**
* Get the resource for the given key from this registry
- * @param entry The Enrty instance that contains meta-data
+ * @param entry The Entry instance that contains meta-data
* @param properties bag of properties with additional information
* @return the matching resultant object
*/
