src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltSets.java

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
   */
  /*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.
--- 1,7 ----
  /*
!  * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
   */
  /*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.
*** 20,30 ****
  /*
   * $Id: ExsltSets.java,v 1.1.2.1 2005/08/01 02:08:50 jeffsuttor Exp $
   */
  package com.sun.org.apache.xalan.internal.lib;
  
! import com.sun.org.apache.xml.internal.utils.DOMHelper;
  import com.sun.org.apache.xpath.internal.NodeSet;
  import java.util.HashMap;
  import java.util.Map;
  import org.w3c.dom.Node;
  import org.w3c.dom.NodeList;
--- 20,30 ----
  /*
   * $Id: ExsltSets.java,v 1.1.2.1 2005/08/01 02:08:50 jeffsuttor Exp $
   */
  package com.sun.org.apache.xalan.internal.lib;
  
! import com.sun.org.apache.xml.internal.utils.DOM2Helper;
  import com.sun.org.apache.xpath.internal.NodeSet;
  import java.util.HashMap;
  import java.util.Map;
  import org.w3c.dom.Node;
  import org.w3c.dom.NodeList;
*** 70,81 ****
        return leadNodes; // empty NodeSet
  
      for (int i = 0; i < nl1.getLength(); i++)
      {
        Node testNode = nl1.item(i);
!       if (DOMHelper.isNodeAfter(testNode, endNode)
!           && !DOMHelper.isNodeTheSame(testNode, endNode))
          leadNodes.addElement(testNode);
      }
      return leadNodes;
    }
  
--- 70,81 ----
        return leadNodes; // empty NodeSet
  
      for (int i = 0; i < nl1.getLength(); i++)
      {
        Node testNode = nl1.item(i);
!       if (DOM2Helper.isNodeAfter(testNode, endNode)
!           && !DOM2Helper.isNodeTheSame(testNode, endNode))
          leadNodes.addElement(testNode);
      }
      return leadNodes;
    }
  
*** 105,116 ****
        return trailNodes; // empty NodeSet
  
      for (int i = 0; i < nl1.getLength(); i++)
      {
        Node testNode = nl1.item(i);
!       if (DOMHelper.isNodeAfter(startNode, testNode)
!           && !DOMHelper.isNodeTheSame(startNode, testNode))
          trailNodes.addElement(testNode);
      }
      return trailNodes;
    }
  
--- 105,116 ----
        return trailNodes; // empty NodeSet
  
      for (int i = 0; i < nl1.getLength(); i++)
      {
        Node testNode = nl1.item(i);
!       if (DOM2Helper.isNodeAfter(startNode, testNode)
!           && !DOM2Helper.isNodeTheSame(startNode, testNode))
          trailNodes.addElement(testNode);
      }
      return trailNodes;
    }