You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2008/03/12 13:21:20 UTC

svn commit: r636297 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/xml/CalloutMediatorSerializer.java mediators/builtin/CalloutMediator.java

Author: ruwan
Date: Wed Mar 12 05:21:17 2008
New Revision: 636297

URL: http://svn.apache.org/viewvc?rev=636297&view=rev
Log:
Minor improvement to the CalloutMediator

Modified:
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java?rev=636297&r1=636296&r2=636297&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java Wed Mar 12 05:21:17 2008
@@ -55,7 +55,7 @@
         }
 
         OMElement target = fac.createOMElement("target", synNS, callout);
-        if (mediator.getTargetXPathString() != null) {
+        if (mediator.getTargetXPath() != null) {
             SynapseXPathSerializer.serializeXPath(mediator.getTargetXPath(), target, "xpath");
         } else if (mediator.getTargetKey() != null) {
             target.addAttribute(fac.createOMAttribute(

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java?rev=636297&r1=636296&r2=636297&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java Wed Mar 12 05:21:17 2008
@@ -51,9 +51,7 @@
     private String serviceURL = null;
     private String action = null;
     private String requestKey = null;
-    private String requestXPathString = null;
     private SynapseXPath requestXPath = null;
-    private String targetXPathString = null;
     private SynapseXPath targetXPath = null;
     private String targetKey = null;
 
@@ -112,7 +110,7 @@
                         tgtNode.detach();
                     } else {
                         handleException("Evaluation of target XPath expression : " +
-                            targetXPathString + " did not yeild an OMNode", synCtx);
+                            targetXPath.toString() + " did not yeild an OMNode", synCtx);
                     }
                 } if (targetKey != null) {
                     synCtx.setProperty(targetKey, result);
@@ -157,10 +155,10 @@
                     return (OMElement) ((List) o).get(0);  // Always fetches *only* the first
                 } else {
                     handleException("The evaluation of the XPath expression : "
-                        + requestXPathString + " did not result in an OMElement", synCtx);
+                        + requestXPath.toString() + " did not result in an OMElement", synCtx);
                 }
             } catch (JaxenException e) {
-                handleException("Error evaluating XPath expression : " + requestXPathString, e, synCtx);
+                handleException("Error evaluating XPath expression : " + requestXPath.toString(), e, synCtx);
             }
         }
         return null;
@@ -209,21 +207,11 @@
         this.requestKey = requestKey;
     }
 
-    public String getRequestXPathString() {
-        return requestXPathString;
-    }
-
     public void setRequestXPath(SynapseXPath requestXPath) throws JaxenException {
-        this.requestXPathString = requestXPath.toString();
         this.requestXPath = requestXPath;
     }
 
-    public String getTargetXPathString() {
-        return targetXPathString;
-    }
-
     public void setTargetXPath(SynapseXPath targetXPath) throws JaxenException {
-        this.targetXPathString = targetXPath.toString();
         this.targetXPath = targetXPath;
     }