# HG changeset patch # User aefimov # Date 1431337737 -10800 # Node ID 834a39f903fd77d657af703bba289e16883a680e # Parent 64c8c98ba2afa5f9246bd728c0491d8d656f243d 8062518, PR2674: AIOBE occurs when accessing to document function in extended function in JAXP Reviewed-by: joehw diff -r 64c8c98ba2af -r 834a39f903fd src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java --- 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) {