Mercurial > hg > icedtea7-forest > jaxp

changeset 1356:834a39f903fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8062518, PR2674: AIOBE occurs when accessing to document function in extended function in JAXP Reviewed-by: joehw
author aefimov
date Mon, 11 May 2015 12:48:57 +0300
parents 64c8c98ba2af
children e3e97df49dcb
files src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java	Thu Oct 15 21:42:22 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java	Mon May 11 12:48:57 2015 +0300
@@ -567,8 +567,12 @@
     }
 
     public NodeList makeNodeList(DTMAxisIterator iter) {
-        // TODO: gather nodes from all DOMs ?
-        return _main.makeNodeList(iter);
+        int index = iter.next();
+        if (index == DTM.NULL) {
+            return null;
+        }
+        iter.reset();
+        return _adapters[getDTMId(index)].makeNodeList(iter);
     }
 
     public String getLanguage(int node) {