cvs commit: ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers RMProvider.java

[jaliya]

jaliya      2005/02/14 04:10:12

  Modified:    sandesha/src/org/apache/sandesha Constants.java
               sandesha/src/org/apache/sandesha/ws/rm/providers
                        RMProvider.java
  Log:
  Change the RMProvider, so that it can first validate the incoming messages 
using the MessageValidator
  
  Revision  Changes    Path
  1.23      +5 -1      ws-fx/sandesha/src/org/apache/sandesha/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/Constants.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Constants.java    11 Feb 2005 11:28:26 -0000      1.22
  +++ Constants.java    14 Feb 2005 12:10:12 -0000      1.23
  @@ -26,7 +26,7 @@
    * @author Jaliya Ekanayaka
    * @author Sudar Nimalan
    */
  -public interface Constants {
  +public interface  Constants {
   
       /**
        * This is the port that is used when generating the source address. Two
  @@ -272,6 +272,10 @@
   
       }
   
  +    public interface InvalidMessageErrors{
  +       public static final String IN_CORRECT_MESSAGE="Incorrect Message";
  +    }
  +
   
   
   }
  
  
  
  1.28      +7 -1      
ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java
  
  Index: RMProvider.java
  ===================================================================
  RCS file: 
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- RMProvider.java   11 Feb 2005 11:28:27 -0000      1.27
  +++ RMProvider.java   14 Feb 2005 12:10:12 -0000      1.28
  @@ -30,6 +30,7 @@
   import org.apache.sandesha.server.IRMMessageProcessor;
   import org.apache.sandesha.server.MessageValidator;
   import org.apache.sandesha.server.RMMessageProcessorIdentifier;
  +import org.apache.sandesha.server.FaultProcessor;
   import org.apache.sandesha.server.dao.ServerQueueDAO;
   import org.apache.sandesha.ws.rm.RMHeaders;
   
  @@ -64,7 +65,12 @@
           try {
               MessageValidator.validate(rmMessageContext);
           } catch (AxisFault af) {
  -            //send the falut
  +            FaultProcessor faultProcessor = new 
FaultProcessor(storageManager,af);
  +            if(!faultProcessor.processMessage(rmMessageContext)){
  +                msgContext.setResponseMessage(null);
  +                return;
  +            }
  +            return;
           }
   
           RMHeaders rmHeaders = rmMessageContext.getRMHeaders();