svn commit: r741174 - /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java

[gatfora]

Author: gatfora
Date: Thu Feb  5 16:42:54 2009
New Revision: 741174

URL: http://svn.apache.org/viewvc?rev=741174&view=rev
Log:
Modifying SenderWorker to always send an ACK but only in the RM1.0 case.  This 
improves the 1.1 performance.

Modified:
    
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java

Modified: 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=741174&r1=741173&r2=741174&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
 (original)
+++ 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
 Thu Feb  5 16:42:54 2009
@@ -68,7 +68,6 @@
 import org.apache.sandesha2.wsrm.CloseSequence;
 import org.apache.sandesha2.wsrm.Identifier;
 import org.apache.sandesha2.wsrm.Sequence;
-import org.apache.sandesha2.wsrm.SequenceAcknowledgement;
 import org.apache.sandesha2.wsrm.TerminateSequence;
 
 public class SenderWorker extends SandeshaWorker implements Runnable {
@@ -233,13 +232,14 @@
                        
                        transaction = storageManager.getTransaction();
 
-                        //if this is an sync WSRM 1.0 case we always have to 
add an ack
+                       //if this is an sync WSRM 1.0 case we always have to 
add an ack
                        boolean ackPresent = false;
                        Iterator it = rmMsgCtx.getSequenceAcknowledgements();
                        if (it.hasNext()) 
                                ackPresent = true;
                        
-                       if (!ackPresent && 
rmMsgCtx.getMessageContext().isServerSide() 
+                       if (!ackPresent && 
Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(rmMsgCtx.getRMSpecVersion())
+                                       && 
rmMsgCtx.getMessageContext().isServerSide() 
                                        &&
                                
(messageType==Sandesha2Constants.MessageTypes.APPLICATION ||
                             
messageType==Sandesha2Constants.MessageTypes.UNKNOWN ||
@@ -498,7 +498,7 @@
                        // stand-alone ack request, and in that case we only 
expect to find a single ack
                        // request header in the message.
                        Iterator<AckRequested> ackRequests = 
rmMsgContext.getAckRequests();
-                       AckRequested ackRequest = (AckRequested) 
ackRequests.next(); 
+                       AckRequested ackRequest = ackRequests.next(); 
                        if (ackRequests.hasNext()) {
                                throw new SandeshaException 
(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.ackRequestMultipleParts));
                        }



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscr...@ws.apache.org
For additional commands, e-mail: sandesha-dev-h...@ws.apache.org