Author: asankha
Date: Sat Nov 18 23:38:29 2006
New Revision: 476752
URL: http://svn.apache.org/viewvc?view=rev&rev=476752
Log:
Fix issue related to reloading dynamic properties and static properties with
caching in the mediators
Fix log mediator to trim the leading space and separator
Modified:
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Property.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java
Modified:
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Property.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Property.java?view=diff&rev=476752&r1=476751&r2=476752
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Property.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Property.java
Sat Nov 18 23:38:29 2006
@@ -171,6 +171,10 @@
return value != null;
}
+ public boolean isDynamic() {
+ return type == DYNAMIC_TYPE;
+ }
+
private void handleException(String msg) {
log.error(msg);
throw new SynapseException(msg);
Modified:
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java?view=diff&rev=476752&r1=476751&r2=476752
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
Sat Nov 18 23:38:29 2006
@@ -81,7 +81,7 @@
private String getCustomLogMessage(MessageContext synCtx) {
StringBuffer sb = new StringBuffer();
setCustomProperties(sb, synCtx);
- return sb.toString();
+ return trimLeadingSeparator(sb);
}
private String getSimpleLogMessage(MessageContext synCtx) {
@@ -101,7 +101,7 @@
if (synCtx.getMessageID() != null)
sb.append(separator + "MessageID: " + synCtx.getMessageID());
setCustomProperties(sb, synCtx);
- return sb.toString();
+ return trimLeadingSeparator(sb);
}
private String getHeadersLogMessage(MessageContext synCtx) {
Modified:
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java?view=diff&rev=476752&r1=476751&r2=476752
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
Sat Nov 18 23:38:29 2006
@@ -61,7 +61,7 @@
Property dp = synCtx.getConfiguration().getPropertyObject(configKey);
// if the configKey refers to a dynamic property
- if (dp != null && dp.getType() == Property.DYNAMIC_TYPE) {
+ if (dp != null && dp.isDynamic()) {
if (!dp.isCached() || dp.isExpired()) {
buildAppContext(synCtx);
}
Modified:
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?view=diff&rev=476752&r1=476751&r2=476752
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
Sat Nov 18 23:38:29 2006
@@ -135,7 +135,7 @@
Property dp = msgCtx.getConfiguration().getPropertyObject(xsltKey);
// if the xsltKey refers to a dynamic property
- if (dp != null) {
+ if (dp != null && dp.isDynamic()) {
if (!dp.isCached() || dp.isExpired()) {
synchronized(transformerLock) {
try {
Modified:
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java?view=diff&rev=476752&r1=476751&r2=476752
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java
Sat Nov 18 23:38:29 2006
@@ -143,6 +143,7 @@
public boolean mediate(MessageContext synCtx) {
+ log.debug("ValidateMediator - Validate mediator mediate()");
ByteArrayInputStream baisFromSource = null;
try {
@@ -190,6 +191,8 @@
handleException("Error validating " + source + " element" +
e.getMessage(), e);
}
+ log.debug("validation of element returned by the XPath expression : "
+ source +
+ " succeeded against the given schemas and the current message");
return true;
}
@@ -206,7 +209,7 @@
while (iter.hasNext()) {
String propKey = (String) iter.next();
Property dp = msgCtx.getConfiguration().getPropertyObject(propKey);
- if (dp != null) {
+ if (dp != null && dp.isDynamic()) {
if (!dp.isCached() || dp.isExpired()) {
reCreate = true; // request re-initialization of
Validator
}
@@ -214,7 +217,7 @@
}
// do not re-initialize Validator unless required
- if (!reCreate) {
+ if (!reCreate && validator != null) {
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
