svn commit: r1033450 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: mediators/GetPropertyFunction.java registry/AbstractRegistry.java

[supun]

Author: supun
Date: Wed Nov 10 13:03:33 2010
New Revision: 1033450

URL: http://svn.apache.org/viewvc?rev=1033450&view=rev
Log:
fixing an issue with get property function not returning a value in registry 
scope

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.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/mediators/GetPropertyFunction.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java?rev=1033450&r1=1033449&r2=1033450&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
 Wed Nov 10 13:03:33 2010
@@ -30,6 +30,7 @@ import org.apache.synapse.SynapseConstan
 import org.apache.synapse.config.Entry;
 import org.apache.synapse.config.xml.XMLConfigConstants;
 import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.registry.Registry;
 import org.jaxen.Context;
 import org.jaxen.Function;
 import org.jaxen.FunctionCallException;
@@ -297,20 +298,19 @@ public class GetPropertyFunction impleme
                 propEntry.setType(Entry.REMOTE_ENTRY);
                 propEntry.setKey(key);
             }
-
-            if (synCtx.getConfiguration().getRegistry() != null) {
-                synCtx.getConfiguration().getRegistry().getResource(propEntry, 
new Properties());
-            }
-            synCtx.getConfiguration().getRegistry().getResource(propEntry, new 
Properties());
-            if (null != propEntry.getEntryProperties()) {
+            Registry registry = synCtx.getConfiguration().getRegistry();
+            if (registry != null) {
+                registry.getResource(propEntry, new Properties());
                 if (propName != null) {
                     Properties reqProperties = propEntry.getEntryProperties();
                     if (reqProperties != null) {
                         if (reqProperties.get(propName) != null) {
-                            return reqProperties.get(propName);
+                            if (reqProperties.get(propName) != null) {
+                                return reqProperties.getProperty(propName);
+                            }
                         }
                     }
-                } else if (propEntry.getValue()!= null) {
+                } else if (propEntry.getValue() != null) {
                     if (propEntry.getValue() instanceof OMText) {
                         return ((OMText) propEntry.getValue()).getText();
                     }

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=1033450&r1=1033449&r2=1033450&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
 Wed Nov 10 13:03:33 2010
@@ -114,6 +114,7 @@ public abstract class AbstractRegistry i
 
             } else {
                 omNode = lookup(entry.getKey());
+                
entry.setEntryProperties(getResourceProperties(entry.getKey()));
             }
         }