You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by ru...@apache.org on 2007/10/31 07:58:18 UTC
svn commit: r590572 -
/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
Author: ruwan
Date: Tue Oct 30 23:58:15 2007
New Revision: 590572
URL: http://svn.apache.org/viewvc?rev=590572&view=rev
Log:
Fixing the issue SYNAPSE-165
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java?rev=590572&r1=590571&r2=590572&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java Tue Oct 30 23:58:15 2007
@@ -44,6 +44,8 @@
private static final Log log = LogFactory.getLog(GetPropertyFunction.class);
private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
+ public static final String NULL_STRING = "";
+
/** Synapse Message context*/
private MessageContext synCtx = null;
@@ -137,31 +139,43 @@
EndpointReference toEPR = synCtx.getTo();
if (toEPR != null) {
return toEPR.getAddress();
+ } else {
+ return NULL_STRING;
}
} else if (SynapseConstants.HEADER_FROM.equals(key)) {
EndpointReference fromEPR = synCtx.getFrom();
if (fromEPR != null) {
return fromEPR.getAddress();
+ } else {
+ return NULL_STRING;
}
} else if (SynapseConstants.HEADER_ACTION.equals(key)) {
String wsaAction = synCtx.getWSAAction();
if (wsaAction != null) {
return wsaAction;
+ } else {
+ return NULL_STRING;
}
} else if (SynapseConstants.HEADER_FAULT.equals(key)) {
EndpointReference faultEPR = synCtx.getFaultTo();
if (faultEPR != null) {
return faultEPR.getAddress();
+ } else {
+ return NULL_STRING;
}
} else if (SynapseConstants.HEADER_REPLY_TO.equals(key)) {
EndpointReference replyToEPR = synCtx.getReplyTo();
if (replyToEPR != null) {
return replyToEPR.getAddress();
+ } else {
+ return NULL_STRING;
}
} else if (SynapseConstants.HEADER_MESSAGE_ID.equals(key)) {
String messageID = synCtx.getMessageID();
if (messageID != null) {
return messageID;
+ } else {
+ return NULL_STRING;
}
} else if (SynapseConstants.PROPERTY_MESSAGE_FORMAT.equals(key)) {
if(synCtx.isDoingPOX())
@@ -171,7 +185,12 @@
else
return SynapseConstants.FORMAT_SOAP12;
} else {
- return synCtx.getProperty(key);
+ Object result = synCtx.getProperty(key);
+ if (result != null) {
+ return result;
+ } else {
+ return synCtx.getEntry(key);
+ }
}
} else if (XMLConfigConstants.SCOPE_AXIS2.equals(scope)
@@ -200,7 +219,7 @@
"synapse:get-property(scope,prop-name) XPath function");
}
}
- return null;
+ return NULL_STRING;
}
private void traceOrDebug(boolean traceOn, String msg) {
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org