Author: indika
Date: Mon Feb 16 09:54:58 2009
New Revision: 744871
URL: http://svn.apache.org/viewvc?rev=744871&view=rev
Log:
fix for SYNAPSE-503
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.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=744871&r1=744870&r2=744871&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
Mon Feb 16 09:54:58 2009
@@ -72,6 +72,14 @@
*/
public Object call(Context context, List args) throws
FunctionCallException {
+ if (synCtx == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Synapse message context has not been set for the " +
+ "XPath extension function
'synapse:get-property(prop-name)'");
+ }
+ return null;
+ }
+
boolean traceOn = synCtx.getTracingState() ==
SynapseConstants.TRACING_ON;
boolean traceOrDebugOn = traceOn || log.isDebugEnabled();
@@ -127,14 +135,6 @@
*/
public Object evaluate(Object scopeObject, Object keyObject, Object
dateformat,Navigator navigator) {
- if (synCtx == null) {
- if (log.isDebugEnabled()) {
- log.debug("Synapse message context has not been set for the " +
- "XPath extension function
'synapse:get-property(prop-name)'");
- }
- return null;
- }
-
boolean traceOn = synCtx.getTracingState() ==
SynapseConstants.TRACING_ON;
boolean traceOrDebugOn = traceOn || log.isDebugEnabled();
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java?rev=744871&r1=744870&r2=744871&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java
(original)
+++
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java
Mon Feb 16 09:54:58 2009
@@ -75,7 +75,7 @@
public boolean evaluateValue(MessageContext synCtx) {
if (this.regKey == null) { // get the node from the current message
payload
- this.value = evaluate(synCtx.getEnvelope());
+ this.value = evaluate(synCtx);
return true;
} else {
//Load the XML document from the registry
