cvs commit: ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors CompositeProcessor.java

[chamikara]

chamikara    2005/06/06 11:27:13

  Modified:    sandesha/src/org/apache/sandesha/server/msgprocessors
                        CompositeProcessor.java
  Log:
  Changes to use the previous functionalities (i.e. sending acks when no 
message for a certain time period)
  
  Revision  Changes    Path
  1.12      +7 -4      
ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java
  
  Index: CompositeProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CompositeProcessor.java   25 May 2005 10:09:00 -0000      1.11
  +++ CompositeProcessor.java   6 Jun 2005 18:27:13 -0000       1.12
  @@ -27,6 +27,7 @@
   import org.apache.sandesha.IStorageManager;
   import org.apache.sandesha.RMMessageContext;
   import org.apache.sandesha.storage.dao.SandeshaQueueDAO;
  +import org.apache.sandesha.storage.queue.SandeshaQueue;
   import org.apache.sandesha.ws.rm.RMHeaders;
   
   import javax.xml.namespace.QName;
  @@ -93,11 +94,13 @@
                       storageManager.insertIncomingMessage(rmMsgContext);
                   }
   
  -                //Send an Ack for every message received by the server.
  -                //This should be changed according to the WS-policy.
  -                 if(rmHeaders.getAckRequest()!=null 
||rmHeaders.getSequence().getLastMessage()!=null){
  -                      return 
ackProcessor.sendAcknowledgement(rmMessageContext);
  +                 // refresh the ack for every message arrived
  +                 //But send only if needed.
  +                 if(rmHeaders.getAckRequest()!=null 
||rmHeaders.getSequence().getLastMessage()!=null){                     
  +                     storageManager.sendAck(sequenceUUID); 
  +                     return 
ackProcessor.sendAcknowledgement(rmMessageContext);
                    } else{
  +                     ackProcessor.sendAcknowledgement(rmMessageContext);
                        return false;
                    }
               }