You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ja...@apache.org on 2004/11/24 14:41:21 UTC

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

jaliya      2004/11/24 05:41:21

  Modified:    sandesha/src/org/apache/sandesha/server
                        CompositeProcessor.java
  Log:
  RMMessageContext does not have the properties to hold the resEnv, reqEnv
  So remove the settings in the composite provider
  
  Revision  Changes    Path
  1.10      +55 -53    ws-fx/sandesha/src/org/apache/sandesha/server/CompositeProcessor.java
  
  Index: CompositeProcessor.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/CompositeProcessor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CompositeProcessor.java	12 Nov 2004 06:18:25 -0000	1.9
  +++ CompositeProcessor.java	24 Nov 2004 13:41:21 -0000	1.10
  @@ -46,63 +46,65 @@
   
               ackProcessor.processMessage(rmMessageContext);
           }
  -        
  +
           if (rmHeaders.getSequence() != null) {
  -        if (rmHeaders.getSequence().getMessageNumber() != null) {
  -            String sequenceID = rmHeaders.getSequence().getIdentifier()
  -                    .getIdentifier();
  -            long messageNumber = rmHeaders.getSequence().getMessageNumber()
  -                    .getMessageNumber();
  -
  -            if (storageManger.isMessageExist(sequenceID, messageNumber) != true) {
  -                //Create a copy of the RMMessageContext.
  -                RMMessageContext rmMsgContext = new RMMessageContext();
  -
  -                try {
  -                    //Copy the request and response messages.
  -                    Message reqMsg = new Message(rmMessageContext
  -                            .getMsgContext().getRequestMessage()
  -                            .getSOAPPartAsString());
  -                    Message resMsg = new Message(rmMessageContext
  -                            .getMsgContext().getResponseMessage()
  -                            .getSOAPPartAsString());
  -
  -                    //Create a new MessageContext, by pasing the axis engine.
  -                    MessageContext msgContext = new MessageContext(
  -                            rmMessageContext.getMsgContext().getAxisEngine());
  -                    //Copy the existing message context to the new message
  -                    // context.
  -                    RMMessageContext.copyMessageContext(rmMessageContext
  -                            .getMsgContext(), msgContext);
  -                    //Copy the RMMEssageContext
  -                    rmMessageContext.copyContents(rmMsgContext);
  -                    //Set the request and response messages of the message
  -                    // context.
  -                    msgContext.setRequestMessage(reqMsg);
  -                    msgContext.setResponseMessage(resMsg);
  -
  -                    rmMsgContext.setReqEnv(reqMsg.getSOAPEnvelope());
  -                    rmMsgContext.setResEnv(resMsg.getSOAPEnvelope());
  -
  -                    rmMsgContext.setMsgContext(msgContext);
  -                    //Set the message type for this message.
  -                    rmMsgContext
  -                            .setMessageType(Constants.MSG_TYPE_SERVICE_REQUEST);
  -                } catch (Exception e) {
  -                    e.printStackTrace();
  -                    //TODO: Add to log.
  +            if (rmHeaders.getSequence().getMessageNumber() != null) {
  +                String sequenceID = rmHeaders.getSequence().getIdentifier()
  +                        .getIdentifier();
  +                long messageNumber = rmHeaders.getSequence().getMessageNumber()
  +                        .getMessageNumber();
  +
  +                if (storageManger.isMessageExist(sequenceID, messageNumber) != true) {
  +                    //Create a copy of the RMMessageContext.
  +                    RMMessageContext rmMsgContext = new RMMessageContext();
  +
  +                    try {
  +                        //Copy the request and response messages.
  +                        Message reqMsg = new Message(rmMessageContext
  +                                .getMsgContext().getRequestMessage()
  +                                .getSOAPPartAsString());
  +                        Message resMsg = new Message(rmMessageContext
  +                                .getMsgContext().getResponseMessage()
  +                                .getSOAPPartAsString());
  +
  +                        //Create a new MessageContext, by pasing the axis
  +                        // engine.
  +                        MessageContext msgContext = new MessageContext(
  +                                rmMessageContext.getMsgContext()
  +                                        .getAxisEngine());
  +                        //Copy the existing message context to the new message
  +                        // context.
  +                        RMMessageContext.copyMessageContext(rmMessageContext
  +                                .getMsgContext(), msgContext);
  +                        //Copy the RMMEssageContext
  +                        rmMessageContext.copyContents(rmMsgContext);
  +                        //Set the request and response messages of the message
  +                        // context.
  +                        msgContext.setRequestMessage(reqMsg);
  +                        msgContext.setResponseMessage(resMsg);
  +
  +                        //rmMsgContext.setReqEnv(reqMsg.getSOAPEnvelope());
  +                        //rmMsgContext.setResEnv(resMsg.getSOAPEnvelope());
  +
  +                        rmMsgContext.setMsgContext(msgContext);
  +                        //Set the message type for this message.
  +                        rmMsgContext
  +                                .setMessageType(Constants.MSG_TYPE_SERVICE_REQUEST);
  +                    } catch (Exception e) {
  +                        e.printStackTrace();
  +                        //TODO: Add to log.
  +                    }
  +
  +                    System.out
  +                            .println("INFO: Inserting the request message ....\n");
  +                    //Insert the message to the INQUEUE
  +                    storageManger.insertIncomingMessage(rmMsgContext);
                   }
   
  -                System.out
  -                        .println("INFO: Inserting the request message ....\n");
  -                //Insert the message to the INQUEUE
  -                storageManger.insertIncomingMessage(rmMsgContext);
  +                //Send an Ack for every message received by the server.
  +                //This should be changed according to the WS-policy.
  +                return ackProcessor.sendAcknowledgement(rmMessageContext);
               }
  -
  -            //Send an Ack for every message received by the server.
  -            //This should be changed according to the WS-policy.
  -            return ackProcessor.sendAcknowledgement(rmMessageContext);
  -        }
           }
           return false;
       }