jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java

*** 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
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2017, 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
*** 38,47 ****
--- 38,49 ----
  import javax.xml.soap.SOAPException;
  import javax.xml.soap.SOAPHeader;
  import javax.xml.soap.SOAPHeaderElement;
  import javax.xml.soap.SOAPMessage;
  
+ import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
+ import com.sun.xml.internal.messaging.saaj.soap.impl.HeaderImpl;
  import com.sun.xml.internal.ws.api.SOAPVersion;
  import com.sun.xml.internal.ws.api.WSBinding;
  import com.sun.xml.internal.ws.api.message.Header;
  import com.sun.xml.internal.ws.api.message.MessageHeaders;
  import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
*** 232,246 ****
      public Header remove(String nsUri, String localName) {
          SOAPHeader soapHeader = ensureSOAPHeader();
          if (soapHeader == null) {
              return null;
          }
          SOAPHeaderElement headerElem = find(nsUri, localName);
          if (headerElem == null) {
              return null;
          }
!         headerElem = (SOAPHeaderElement) soapHeader.removeChild(headerElem);
  
          //it might have been a nonSAAJHeader - remove from that map
          removeNonSAAJHeader(headerElem);
  
          //remove it from understoodHeaders and notUnderstoodHeaders if present
--- 234,249 ----
      public Header remove(String nsUri, String localName) {
          SOAPHeader soapHeader = ensureSOAPHeader();
          if (soapHeader == null) {
              return null;
          }
+         SOAPDocumentImpl soapDocument = ((HeaderImpl)soapHeader).getSoapDocument();
          SOAPHeaderElement headerElem = find(nsUri, localName);
          if (headerElem == null) {
              return null;
          }
!         headerElem = (SOAPHeaderElement) soapDocument.find(soapHeader.removeChild(headerElem));
  
          //it might have been a nonSAAJHeader - remove from that map
          removeNonSAAJHeader(headerElem);
  
          //remove it from understoodHeaders and notUnderstoodHeaders if present
*** 328,338 ****
          return !(header instanceof SAAJHeader);
      }
  
      private void addNonSAAJHeader(SOAPHeaderElement headerElem, Header header) {
          if (nonSAAJHeaders == null) {
!             nonSAAJHeaders = new HashMap<SOAPHeaderElement, Header>();
          }
          nonSAAJHeaders.put(headerElem, header);
      }
  
      private void removeNonSAAJHeader(SOAPHeaderElement headerElem) {
--- 331,341 ----
          return !(header instanceof SAAJHeader);
      }
  
      private void addNonSAAJHeader(SOAPHeaderElement headerElem, Header header) {
          if (nonSAAJHeaders == null) {
!             nonSAAJHeaders = new HashMap<>();
          }
          nonSAAJHeaders.put(headerElem, header);
      }
  
      private void removeNonSAAJHeader(SOAPHeaderElement headerElem) {