Author: ruwan
Date: Wed Dec  5 20:55:30 2007
New Revision: 601612

URL: http://svn.apache.org/viewvc?rev=601612&view=rev
Log:
Minor fix to the clone MC method and adding generics to the CloneMediator

Modified:
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java?rev=601612&r1=601611&r2=601612&view=diff
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
 Wed Dec  5 20:55:30 2007
@@ -47,7 +47,7 @@
     /**
      * Holds the list of targets to which cloned copies of the message will be 
given for mediation
      */
-    private List targets = new ArrayList();
+    private List<Target> targets = new ArrayList<Target>();
 
     /**
      * This will implement the mediate method of the Mediator interface and 
will provide the
@@ -97,7 +97,7 @@
         OperationContext opCtx
             = ((Axis2MessageContext) 
synCtx).getAxis2MessageContext().getOperationContext();
         if (!continueParent && opCtx != null) {
-            opCtx.setProperty(Constants.RESPONSE_WRITTEN,"SKIP");
+            opCtx.setProperty(Constants.RESPONSE_WRITTEN, "SKIP");
         }
 
         // if continue parent is true mediators after the clone will be called 
for the further
@@ -114,7 +114,7 @@
      * @return MessageContext which is cloned from the given parameters
      */
     private MessageContext getClonedMessageContext(MessageContext synCtx, int 
messageSequence,
-        int messageCount) {
+                                                   int messageCount) {
 
         MessageContext newCtx = null;
         try {
@@ -125,8 +125,9 @@
         }
 
         // Sets the property MESSAGE_SEQUENCE to the MC for aggragation 
purposes 
-        newCtx.setProperty(EIPConstants.MESSAGE_SEQUENCE,
-            String.valueOf(messageSequence) + 
EIPConstants.MESSAGE_SEQUENCE_DELEMITER + messageCount);
+        assert newCtx != null;
+        newCtx.setProperty(EIPConstants.MESSAGE_SEQUENCE, 
String.valueOf(messageSequence)
+            + EIPConstants.MESSAGE_SEQUENCE_DELEMITER + messageCount);
 
         return newCtx;
     }
@@ -143,11 +144,11 @@
         this.continueParent = continueParent;
     }
 
-    public List getTargets() {
+    public List<Target> getTargets() {
         return targets;
     }
 
-    public void setTargets(List targets) {
+    public void setTargets(List<Target> targets) {
         this.targets = targets;
     }
 

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java?rev=601612&r1=601611&r2=601612&view=diff
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
 Wed Dec  5 20:55:30 2007
@@ -95,7 +95,7 @@
         org.apache.axis2.context.MessageContext mc) throws AxisFault {
 
         org.apache.axis2.context.MessageContext newMC = clonePartially(mc);
-        
newMC.setEnvelope(cloneSOAPEnvelope(cloneSOAPEnvelope(mc.getEnvelope())));
+        newMC.setEnvelope(cloneSOAPEnvelope(mc.getEnvelope()));
         
         newMC.setServiceContext(mc.getServiceContext());
         newMC.setOperationContext(mc.getOperationContext());



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to