src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, 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
*** 30,40 ****
  
  import javax.xml.namespace.QName;
  import javax.xml.soap.*;
  
  import org.w3c.dom.Element;
- import org.w3c.dom.Node;
  
  import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
  import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
  import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
  import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
--- 30,39 ----
*** 114,143 ****
  
      public Iterator extractHeaderElements(String actor) {
          return getHeaderElementsForActor(actor, true, false);
      }
  
!     protected Iterator getHeaderElementsForActor(
          String actor,
          boolean detach,
          boolean mustUnderstand) {
          if (actor == null || actor.equals("")) {
              log.severe("SAAJ0132.impl.invalid.value.for.actor.or.role");
              throw new IllegalArgumentException("Invalid value for actor or role");
          }
          return getHeaderElements(actor, detach, mustUnderstand);
      }
  
!     protected Iterator getHeaderElements(
          String actor,
          boolean detach,
          boolean mustUnderstand) {
!         List elementList = new ArrayList();
  
!         Iterator eachChild = getChildElements();
  
!         Object currentChild = iterate(eachChild);
          while (currentChild != null) {
              if (!(currentChild instanceof SOAPHeaderElement)) {
                  currentChild = iterate(eachChild);
              } else {
                  HeaderElementImpl currentElement =
--- 113,142 ----
  
      public Iterator extractHeaderElements(String actor) {
          return getHeaderElementsForActor(actor, true, false);
      }
  
!     protected Iterator<SOAPHeaderElement> getHeaderElementsForActor(
          String actor,
          boolean detach,
          boolean mustUnderstand) {
          if (actor == null || actor.equals("")) {
              log.severe("SAAJ0132.impl.invalid.value.for.actor.or.role");
              throw new IllegalArgumentException("Invalid value for actor or role");
          }
          return getHeaderElements(actor, detach, mustUnderstand);
      }
  
!     protected Iterator<SOAPHeaderElement> getHeaderElements(
          String actor,
          boolean detach,
          boolean mustUnderstand) {
!         List<SOAPHeaderElement> elementList = new ArrayList<SOAPHeaderElement>();
  
!         Iterator<org.w3c.dom.Node> eachChild = getChildElements();
  
!         org.w3c.dom.Node currentChild = iterate(eachChild);
          while (currentChild != null) {
              if (!(currentChild instanceof SOAPHeaderElement)) {
                  currentChild = iterate(eachChild);
              } else {
                  HeaderElementImpl currentElement =
*** 171,181 ****
          }
  
          return elementList.listIterator();
      }
  
!     private Object iterate(Iterator each) {
          return each.hasNext() ? each.next() : null;
      }
  
      public void setParentElement(SOAPElement element) throws SOAPException {
          if (!(element instanceof SOAPEnvelope)) {
--- 170,180 ----
          }
  
          return elementList.listIterator();
      }
  
!     private <T> T iterate(Iterator<T> each) {
          return each.hasNext() ? each.next() : null;
      }
  
      public void setParentElement(SOAPElement element) throws SOAPException {
          if (!(element instanceof SOAPEnvelope)) {