Mercurial > hg > openjdk > aarch64-port > jaxp
changeset 995:3cb841defba0 jdk8u60-b16
Merge
author | lana |
---|---|
date | Thu, 14 May 2015 20:13:26 -0700 |
parents | 9f45d0bb1827 (current diff) 0262b5e33bc4 (diff) |
children | e882f38df713 |
files | |
diffstat | 4 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Wed May 13 12:50:08 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Thu May 14 20:13:26 2015 -0700 @@ -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) {
--- a/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java Wed May 13 12:50:08 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java Thu May 14 20:13:26 2015 -0700 @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development
--- a/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java Wed May 13 12:50:08 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java Thu May 14 20:13:26 2015 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 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
--- a/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java Wed May 13 12:50:08 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java Thu May 14 20:13:26 2015 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 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