src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 26,35 ****
--- 26,36 ----
  package com.sun.xml.internal.ws.addressing;
  
  import com.sun.istack.internal.NotNull;
  import com.sun.xml.internal.ws.addressing.model.ActionNotSupportedException;
  import com.sun.xml.internal.ws.api.WSBinding;
+ import com.sun.xml.internal.ws.api.message.AddressingUtils;
  import com.sun.xml.internal.ws.api.message.Packet;
  import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
  import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
  import com.sun.xml.internal.ws.api.pipe.NextAction;
  import com.sun.xml.internal.ws.api.pipe.Tube;
*** 71,82 ****
      public @NotNull NextAction processResponse(Packet response) {
          // if one-way then, no validation
          if (response.getMessage() != null) {
              response = validateInboundHeaders(response);
              response.addSatellite(new WsaPropertyBag(addressingVersion,soapVersion,response));
!             String msgId = response.getMessage().getHeaders().
!               getMessageID(addressingVersion, soapVersion);
              response.put(WsaPropertyBag.WSA_MSGID_FROM_REQUEST, msgId);
          }
  
          return doReturnWith(response);
      }
--- 72,84 ----
      public @NotNull NextAction processResponse(Packet response) {
          // if one-way then, no validation
          if (response.getMessage() != null) {
              response = validateInboundHeaders(response);
              response.addSatellite(new WsaPropertyBag(addressingVersion,soapVersion,response));
!             String msgId = AddressingUtils.
!               getMessageID(response.getMessage().getHeaders(),
!                       addressingVersion, soapVersion);
              response.put(WsaPropertyBag.WSA_MSGID_FROM_REQUEST, msgId);
          }
  
          return doReturnWith(response);
      }
*** 88,98 ****
          //For instance this may be a RM CreateSequence message.
          WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
  
          if (wbo == null)    return;
  
!         String gotA = packet.getMessage().getHeaders().getAction(addressingVersion, soapVersion);
          if (gotA == null)
              throw new WebServiceException(AddressingMessages.VALIDATION_CLIENT_NULL_ACTION());
  
          String expected = helper.getOutputAction(packet);
  
--- 90,102 ----
          //For instance this may be a RM CreateSequence message.
          WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
  
          if (wbo == null)    return;
  
!         String gotA = AddressingUtils.getAction(
!                 packet.getMessage().getHeaders(),
!                 addressingVersion, soapVersion);
          if (gotA == null)
              throw new WebServiceException(AddressingMessages.VALIDATION_CLIENT_NULL_ACTION());
  
          String expected = helper.getOutputAction(packet);