Author: indika
Date: Tue Jul 17 22:56:30 2007
New Revision: 557158
URL: http://svn.apache.org/viewvc?view=rev&rev=557158
Log:
minor improvement to the code and comments
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java?view=diff&rev=557158&r1=557157&r2=557158
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java
Tue Jul 17 22:56:30 2007
@@ -18,13 +18,13 @@
*/
package org.apache.synapse.config.xml;
-import org.apache.synapse.mediators.AbstractListMediator;
-import org.apache.synapse.MessageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseException;
-import java.util.regex.Pattern;
import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* A SwitchCase define a case element of Switch Mediator and It has a list
mediator and
@@ -100,6 +100,10 @@
* @return boolean value
*/
public boolean matches(String value) {
+ if (regex == null) {
+ String msg = "The 'regex' is required for a switch case
definition";
+ handleException(msg);
+ }
Matcher matcher = regex.matcher(value);
if(matcher == null){
return false;
@@ -109,5 +113,10 @@
log.debug("Case : " + regex.pattern() + " evaluated to : " +
retVal);
}
return retVal;
+ }
+
+ private void handleException(String msg) {
+ log.error(msg);
+ throw new SynapseException(msg);
}
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java?view=diff&rev=557158&r1=557157&r2=557158
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
Tue Jul 17 22:56:30 2007
@@ -22,13 +22,14 @@
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.MessageContext;
import org.apache.synapse.Constants;
+import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
-import java.util.Map;
+
import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
/**
@@ -58,7 +59,7 @@
private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
/**
- * Sets or a property into the current (local) Synapse Context or into
the Axis Message Context
+ * Sets a property into the current (local) Synapse Context or into the
Axis Message Context
* or into Transports Header
* And Removes above properties from the corresspounding locations
*
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java?view=diff&rev=557158&r1=557157&r2=557158
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
Tue Jul 17 22:56:30 2007
@@ -78,7 +78,6 @@
log.debug("Fault mediator mediate()");
}
boolean shouldTrace = shouldTrace(synCtx.getTracingState());
- SOAPEnvelope envelop = synCtx.getEnvelope();
if(shouldTrace) {
trace.trace("Start : Fault mediator");
}
@@ -88,6 +87,7 @@
case SOAP12:
return makeSOAPFault(synCtx, SOAP12,shouldTrace);
default : {
+ SOAPEnvelope envelop = synCtx.getEnvelope();
if (envelop != null) {
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
envelop.getNamespace().getNamespaceURI())) {
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?view=diff&rev=557158&r1=557157&r2=557158
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
Tue Jul 17 22:56:30 2007
@@ -377,6 +377,10 @@
}
}
+ /**
+ *
+ * @return Returns the features explicitly set to the TransformerFactory
through this mediator
+ */
public List getFeatures(){
return explicityFeatures;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
