[jboss-cvs] webservice/src/main/org/jboss/ws/addressing/soap ...

[Thomas D. <tho...@jb...>]

  User: tdiesler
  Date: 06/03/15 15:14:27

  Modified:    src/main/org/jboss/ws/addressing/soap 
                        SOAPServerHandler.java
  Log:
  Do not assert property names in MessageContext
  
  Revision  Changes    Path
  1.9       +7 -9      webservice/src/main/org/jboss/ws/addressing/soap/SOAPServerHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SOAPServerHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/webservice/src/main/org/jboss/ws/addressing/soap/SOAPServerHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- SOAPServerHandler.java	15 Mar 2006 19:30:02 -0000	1.8
  +++ SOAPServerHandler.java	15 Mar 2006 20:14:27 -0000	1.9
  @@ -26,8 +26,8 @@
   import javax.xml.rpc.handler.MessageContext;
   import javax.xml.rpc.handler.soap.SOAPMessageContext;
   import javax.xml.soap.SOAPMessage;
  -import javax.xml.ws.addressing.JAXWSAConstants;
   import javax.xml.ws.addressing.AttributedURI;
  +import javax.xml.ws.addressing.JAXWSAConstants;
   import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
   import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
   
  @@ -100,19 +100,17 @@
         SOAPAddressingBuilder builder = (SOAPAddressingBuilder)SOAPAddressingBuilder.getAddressingBuilder();
         SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
   
  -      SOAPAddressingProperties outProps = null;
  -      boolean hasInProps = msgContext.containsProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
  -      boolean hasOutProps = msgContext.containsProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND);
  -      if (hasInProps == true && hasOutProps == false)
  +      SOAPAddressingProperties inProps = (SOAPAddressingProperties)msgContext.getProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
  +      SOAPAddressingProperties outProps = (SOAPAddressingProperties)msgContext.getProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND);
  +      if (inProps != null && outProps == null)
         {
            outProps = (SOAPAddressingProperties)builder.newAddressingProperties();
   
  -         SOAPAddressingProperties inProps = (SOAPAddressingProperties)msgContext.getProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
            outProps.initializeAsReply(inProps, isFault);
   
  -         AttributedURI wsaReplyAction = inProps.getAction();
  -         if (msgContext.containsProperty(SERVER_ADDRESSING_RESPONSE_ACTION))
  -            wsaReplyAction = (AttributedURI)msgContext.getProperty(SERVER_ADDRESSING_RESPONSE_ACTION);
  +         AttributedURI wsaReplyAction = (AttributedURI)msgContext.getProperty(SERVER_ADDRESSING_RESPONSE_ACTION);
  +         if (wsaReplyAction == null)
  +            wsaReplyAction = inProps.getAction();
            
            outProps.setAction(wsaReplyAction);