/hg/icedtea8-forest/jaxp: 43 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Aug 8 14:54:10 UTC 2016
changeset 79f797fa55d8 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=79f797fa55d8
author: asaha
date: Mon Jan 25 15:47:50 2016 -0800
Added tag jdk8u82-b00 for changeset b96204430344
changeset baac0cbb7939 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=baac0cbb7939
author: aefimov
date: Fri Feb 05 14:40:11 2016 +0300
8144593: Suppress not recognized property/feature warning messages from SAXParser
Reviewed-by: joehw
changeset fc67851c77ef in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=fc67851c77ef
author: aefimov
date: Fri Feb 05 14:57:06 2016 +0300
8072081: Supplementary characters are rejected in comments
Reviewed-by: lancea
changeset 2abe6fc9bb5f in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=2abe6fc9bb5f
author: robm
date: Fri Feb 05 13:53:27 2016 +0000
Merge
changeset 802eb620ffab in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=802eb620ffab
author: asaha
date: Mon Feb 01 16:34:00 2016 -0800
Merge
changeset a43504eeb367 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=a43504eeb367
author: asaha
date: Fri Feb 05 09:33:30 2016 -0800
Merge
changeset 447aab25a88b in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=447aab25a88b
author: aefimov
date: Mon Feb 29 15:46:01 2016 +0300
8149915: enabling validate-annotations feature for xsd schema with annotation causes NPE
Reviewed-by: joehw
changeset d595138c9527 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=d595138c9527
author: aefimov
date: Mon Feb 29 15:48:01 2016 +0300
8150470: JCK: api/xsl/conf/copy/copy19 test failure
Reviewed-by: joehw, aefimov
changeset e115e07905cf in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=e115e07905cf
author: asaha
date: Wed Mar 23 12:20:59 2016 -0700
Added tag jdk8u102-b00 for changeset b96204430344
changeset 40331ef7637a in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=40331ef7637a
author: asaha
date: Wed Mar 23 15:02:09 2016 -0700
Merge
changeset e31d3ecd2928 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=e31d3ecd2928
author: asaha
date: Tue Mar 22 12:05:56 2016 -0700
Merge
changeset 7ae23fadd851 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=7ae23fadd851
author: asaha
date: Wed Mar 23 15:18:04 2016 -0700
Merge
changeset 2728110e2bc5 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=2728110e2bc5
author: asaha
date: Tue Mar 29 13:26:44 2016 -0700
Added tag jdk8u102-b01 for changeset 7ae23fadd851
changeset aabd540d440c in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=aabd540d440c
author: aefimov
date: Mon Mar 28 16:39:28 2016 +0300
8150704: XALAN: ERROR: 'No more DTM IDs are available' when transforming with lots of temporary result trees
Reviewed-by: joehw
changeset 760d26dbaa27 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=760d26dbaa27
author: robm
date: Tue Mar 29 23:01:27 2016 +0100
Merge
changeset ebe7dc636783 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=ebe7dc636783
author: asaha
date: Mon Apr 11 13:49:10 2016 -0700
Added tag jdk8u102-b02 for changeset 760d26dbaa27
changeset b597ebd5ef6a in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=b597ebd5ef6a
author: asaha
date: Tue Apr 05 10:12:15 2016 -0700
Merge
changeset 9be3e75c8f46 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=9be3e75c8f46
author: asaha
date: Mon Apr 11 14:59:25 2016 -0700
Merge
changeset 58469c50677d in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=58469c50677d
author: asaha
date: Mon Apr 18 15:30:18 2016 -0700
Added tag jdk8u102-b03 for changeset 9be3e75c8f46
changeset 4e861d843046 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=4e861d843046
author: asaha
date: Mon Apr 25 09:32:51 2016 -0700
Added tag jdk8u102-b04 for changeset 58469c50677d
changeset f5cb21e3a361 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=f5cb21e3a361
author: asaha
date: Tue Apr 26 13:13:56 2016 -0700
Merge
changeset fc3257c98f34 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=fc3257c98f34
author: asaha
date: Wed Apr 27 15:32:12 2016 -0700
Added tag jdk8u102-b05 for changeset f5cb21e3a361
changeset 545ae88cd091 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=545ae88cd091
author: asaha
date: Mon May 02 14:55:34 2016 -0700
Merge
changeset fe98180f7d02 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=fe98180f7d02
author: asaha
date: Mon May 02 15:04:39 2016 -0700
Added tag jdk8u102-b06 for changeset 545ae88cd091
changeset f563e46f3083 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=f563e46f3083
author: asaha
date: Mon May 09 11:39:26 2016 -0700
Merge
changeset 2fb7aa06f656 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=2fb7aa06f656
author: asaha
date: Mon May 09 11:53:16 2016 -0700
Added tag jdk8u102-b07 for changeset f563e46f3083
changeset 91dba3952a3d in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=91dba3952a3d
author: aefimov
date: Fri May 13 18:34:27 2016 +0300
8145974: XMLStreamWriter produces invalid XML for surrogate pairs on OutputStreamWriter
Reviewed-by: joehw
changeset c9f8318eb631 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=c9f8318eb631
author: asaha
date: Mon May 16 10:45:58 2016 -0700
Merge
changeset e569e50bd8a5 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=e569e50bd8a5
author: asaha
date: Mon May 16 10:55:46 2016 -0700
Added tag jdk8u102-b08 for changeset c9f8318eb631
changeset 05f5349489ca in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=05f5349489ca
author: asaha
date: Thu May 19 03:55:15 2016 -0700
8157078: 8u102 L10n resource file updates
Summary: 8u102 L10n resource file updates
Reviewed-by: coffeys
Contributed-by: li.jiang at oracle.com
changeset 8f5ebb91ab3a in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=8f5ebb91ab3a
author: asaha
date: Mon May 23 20:46:42 2016 -0700
Merge
changeset 7c1960760222 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=7c1960760222
author: asaha
date: Mon May 23 20:54:20 2016 -0700
Added tag jdk8u102-b09 for changeset 8f5ebb91ab3a
changeset 018c7ebb858c in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=018c7ebb858c
author: asaha
date: Tue May 31 10:12:24 2016 -0700
Merge
changeset d57268471f67 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=d57268471f67
author: asaha
date: Tue May 31 10:29:44 2016 -0700
Added tag jdk8u102-b10 for changeset 018c7ebb858c
changeset 429621d25778 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=429621d25778
author: asaha
date: Mon Jun 06 12:59:56 2016 -0700
Merge
changeset 936c7a3ab382 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=936c7a3ab382
author: asaha
date: Mon Jun 06 13:19:56 2016 -0700
Added tag jdk8u102-b11 for changeset 429621d25778
changeset fef62f7eb599 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=fef62f7eb599
author: asaha
date: Mon Jun 13 13:15:02 2016 -0700
Merge
changeset 1e32365d1f18 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=1e32365d1f18
author: asaha
date: Mon Jun 13 13:23:19 2016 -0700
Added tag jdk8u102-b12 for changeset fef62f7eb599
changeset 2879af37c6c4 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=2879af37c6c4
author: asaha
date: Tue Jun 21 18:20:50 2016 -0700
Added tag jdk8u101-b13 for changeset 8ee36eca2124
changeset e9de037c3b4c in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=e9de037c3b4c
author: asaha
date: Tue Jun 21 18:43:28 2016 -0700
Merge
changeset 1f032000ff4b in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=1f032000ff4b
author: asaha
date: Tue Jun 21 18:49:36 2016 -0700
Added tag jdk8u102-b13 for changeset e9de037c3b4c
changeset b536766d32b3 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=b536766d32b3
author: andrew
date: Fri Aug 05 05:27:04 2016 +0100
Merge jdk8u102-b14
changeset 11f747b59cb0 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=11f747b59cb0
author: andrew
date: Mon Aug 08 15:51:26 2016 +0100
Added tag icedtea-3.2.0pre02 for changeset b536766d32b3
diffstat:
.hgtags | 116 ++++
.jcheck/conf | 2 -
src/com/sun/org/apache/xalan/internal/XalanConstants.java | 15 +
src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java | 6 +-
src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java | 6 +-
src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java | 2 +-
src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java | 25 +-
src/com/sun/org/apache/xalan/internal/xsltc/DOM.java | 6 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java | 20 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java | 37 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java | 5 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java | 8 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java | 60 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java | 9 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java | 9 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java | 53 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java | 43 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java | 2 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java | 2 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java | 13 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java | 15 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java | 49 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java | 25 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java | 10 +-
src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java | 18 +-
src/com/sun/org/apache/xerces/internal/impl/Constants.java | 17 +-
src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java | 81 +--
src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java | 154 +----
src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java | 192 +++----
src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java | 57 +-
src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java | 212 +++----
src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java | 191 +++---
src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java | 60 +-
src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 21 +-
src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java | 237 ++++++--
src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java | 43 +-
src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java | 262 ++++++---
src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java | 84 +--
src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties | 2 +-
src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties | 4 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties | 4 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties | 3 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties | 97 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties | 3 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties | 3 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties | 3 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties | 3 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties | 3 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties | 3 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties | 3 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties | 3 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties | 11 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties | 2 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties | 2 +-
src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java | 8 +-
src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java | 220 ++++----
src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java | 4 +-
src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java | 135 ++--
src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java | 6 +-
src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java | 16 +-
src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java | 26 +-
src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java | 4 +-
src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java | 16 +-
src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java | 4 +-
src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java | 2 +-
src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java | 36 +-
66 files changed, 1507 insertions(+), 1286 deletions(-)
diffs (truncated from 6966 to 500 lines):
diff -r b96204430344 -r 11f747b59cb0 .hgtags
--- a/.hgtags Mon Jan 25 13:22:15 2016 -0800
+++ b/.hgtags Mon Aug 08 15:51:26 2016 +0100
@@ -50,6 +50,7 @@
feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73
ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75
+fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12
233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
@@ -63,6 +64,7 @@
81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87
d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88
+826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13
d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89
c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90
b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91
@@ -111,6 +113,7 @@
d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134
4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
+1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14
1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
@@ -297,6 +300,7 @@
30b8baceb72bcec111c6aad37eef96d18c09e4ef jdk8u20-b07
68e2ea32f92731b8ad8157252116db89903b51a3 jdk8u20-b08
b706e9775bf7512845120740870f717341e2b497 jdk8u20-b09
+e16be40cfc3232b05ec85865714b0397ff99c6fc icedtea-3.0.0pre01
c356de7051ea6d25de07ef86f60eb6647eaaf2d0 jdk8u20-b10
40b6440e569e5f7a00f5763eddc6dc8ae24421f1 jdk8u20-b11
8f49f969030574e46a52f3bcbd77790045a2ec07 jdk8u20-b12
@@ -310,6 +314,7 @@
255d961955e4fdb83ce105ae990c26b87022363f jdk8u20-b20
3a1bba8076da4e54882123e98e219eab1c31ccef jdk8u20-b21
bf115689d89bb82dc1efbe0348657e993715e850 jdk8u20-b22
+888f90c5e7da5fd649dc23c1d92cd2496f650ea9 icedtea-3.0.0pre02
d6ded60cfdc53861ae7d1a010f95b5036d610e80 jdk8u20-b23
dd09d8b9edefb5684941941e5d9b35c84ee066f3 jdk8u20-b24
dd09d8b9edefb5684941941e5d9b35c84ee066f3 jdk8u20-b25
@@ -377,6 +382,9 @@
6103f5a8119a85937ae006f18b8dfc04f73315d0 jdk8u40-b18
3b73732d6886dc8155f0c1fbb125ca60d9e2fd2b jdk8u40-b19
7bfc889330e0ec1fd495990eaa0d7f0c390b7304 jdk8u40-b20
+e727012c23d92dabce5f38534719161b146a5e34 icedtea-3.0.0pre03
+c62dd685e5179d789121aa5e04841f9df1ca2b20 icedtea-3.0.0pre04
+792da500df0daaa1755315f221208a794da32b74 icedtea-3.0.0pre05
78d90db9de2801eec010ccb9f0db3caf969dfc3b jdk8u40-b21
54a13451ce243f2159ed3996e6efcf374a5750ca jdk8u40-b22
e07fbae1efeac4e50514384caa7d226af7414114 jdk8u40-b23
@@ -386,6 +394,7 @@
56f6ca79467d04eb95383102046836b6ac7d2811 jdk8u40-b27
7e43d4e20a33b8b6bd06112e39d367b51de921a7 jdk8u40-b31
8facbe662ec106f1aae271f5c59909e124938c40 jdk8u40-b32
+b02301aeab79b1ee7859aeeb994fa5ba31105734 jdk8u40-b33
9286acc600a779acb8bcfab38e82d4f50704afe3 jdk8u45-b00
9fded65e1d36e3388111955d50ebf8511dd0345e jdk8u45-b01
62566a3dbe5982565ce3e468ee3980b7937a86cc jdk8u45-b02
@@ -429,6 +438,7 @@
4519799749671cef69091e354b7cd52496f6d970 jdk8u51-b31
975b01e6be932672edd527f6efe4b430d7bcf07a jdk8u51-b32
59aea46232797f247aab869d751e4b8090eb4789 jdk8u51-b33
+55657ee85e8e4157836bb4b748d76234b1360e95 jdk8u51-b34
3b73732d6886dc8155f0c1fbb125ca60d9e2fd2b jdk8u60-b00
b0e15cd169a93080c4e30e9eb3061d0b329bf38c jdk8u60-b01
0b64e727bdb06c82caa02ef25ac2552ce3314537 jdk8u60-b02
@@ -453,6 +463,9 @@
def8014e497099d6f1b1fc64554b15345a574a96 jdk8u60-b21
bc1ad5d83a65339c40a17406ea38d2ea8cbb9807 jdk8u60-b22
9d6b607dcbf820cfec17d6f8775d8649630cfb35 jdk8u60-b23
+69e0cb284d8aa2a686c0428ff971dd2fee7a717c icedtea-3.0.0pre06
+c08ba71fef662a52a0ac4f2fbacd1acc37764bc2 icedtea-3.0.0pre07
+ac52a8eed3530872eebf7092ea687b0ac8c03944 icedtea-3.0.0pre08
c8ea5afd3d53a31b2aae76bc814e7384cae87b87 jdk8u60-b24
7a74fd4791e866c031df3c22cfc19ce71d3d952e jdk8u60-b25
9db1721b527eee3b41ff73fcd36ae052227bbf59 jdk8u60-b26
@@ -499,6 +512,11 @@
fc348901e958842a757d59c6b35846d13ab86793 jdk8u66-b17
4ae0c2d6dd24931f3f271e645221e5331e351c00 jdk8u66-b18
8af7da6c13af3c95bc9933e6d1e0d83648f6c0ae jdk8u66-b31
+1db6026e38d41f217bcbe2b619711b850c1788f4 jdk8u66-b32
+a85030db026108135a95b86c343280ed7bda322a jdk8u66-b33
+59dc259db9ad7d7eaa98b9540734bd5c22d9bc86 jdk8u66-b34
+a9f8281d8391e90f255bb754d1d6b31dba18e77d jdk8u66-b35
+d11c3bc0881a83bacfd8fd25f7c8d29cb405afe5 jdk8u66-b36
700dc6c623439c5df98253fba49387919dd8732d jdk8u71-b00
f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01
90bca51fcdaa065b823ece61e4b0af1ad81955e5 jdk8u71-b02
@@ -530,9 +548,107 @@
68b880e0f5de1d49914790f1a6e5c6e4c3847434 jdk8u72-b12
58630fde67f4ba7b0fbe8509bb0b105f065383a8 jdk8u72-b13
05c35ec04d298ad11a97a0c82e54e4468542c6e7 jdk8u72-b14
+6527813420de90e946f1cd2bcb8fe4a7972b3bef icedtea-3.0.0pre09
1bcc418943405c5ef677eb3f63783683261bd2d3 jdk8u72-b15
+aeecbaa27f807ce0656a108cd0e81669724b8d1b jdk8u73-b00
+9009a8b2b55256764dd304902b04a3dea2597684 jdk8u73-b01
+7a021985ef009c3a88a206d6f295f17e382f98b9 jdk8u73-b02
+2e7b89c7f79794b872e73708fdaa3ed9331ec45d jdk8u74-b00
+aa9485a887b7e983f9743c9c114de2055055300d jdk8u74-b01
+b3325c0526621f9ddf82738373cc8f8947dab195 jdk8u74-b02
+2b3d0e6f3cd179e2346679af2a8881bb6b20f968 jdk8u72-b31
+aeecbaa27f807ce0656a108cd0e81669724b8d1b jdk8u73-b00
+9009a8b2b55256764dd304902b04a3dea2597684 jdk8u73-b01
+7a021985ef009c3a88a206d6f295f17e382f98b9 jdk8u73-b02
+2e7b89c7f79794b872e73708fdaa3ed9331ec45d jdk8u74-b00
+aa9485a887b7e983f9743c9c114de2055055300d jdk8u74-b01
+b3325c0526621f9ddf82738373cc8f8947dab195 jdk8u74-b02
+c583ac51e2c78d6c59786b447986baf7b961518d jdk8u74-b31
+4c8fd0814bf0bcbc9666a29e1daa35c64c7bb57a jdk8u74-b32
+8cc52edbb741c42e09f4b132ca0a759d3de6f848 jdk8u77-b00
+8f0ed89698a28138065b6b941769650627636745 jdk8u77-b01
+27f1130320a55b6b89024cb8baa93c8767c516d2 jdk8u77-b02
+1c71899e85662239085fab94ad5c26441e7a80cd jdk8u77-b03
+a49d8c7db1e5b3ab84561069bd4ae63579139878 jdk8u77-b31
+eca165c0654ac2e1926b50655e5ed5e9b73ca674 jdk8u75-b00
+06cdf5dc679e0fef7c8e37c5c712b2c5891c1444 jdk8u75-b01
+26c297e9f11b78b55cdefd22849ae4fe55042a5b jdk8u75-b02
+2a292503c55704cb7f898fa195d76682c0ea6a72 jdk8u75-b03
+cb072b12f5dbe3a249d596078d98a34ec9364187 jdk8u101-b00
+cb072b12f5dbe3a249d596078d98a34ec9364187 jdk8u75-b04
+40ccc40d58450eb4518348f6b34885c5a711675a jdk8u75-b05
+e77acebebfdc2f84b1217be3a6a2eb4c205afda5 jdk8u75-b06
+e5423deded19531b7288480b059209c825046ce4 jdk8u75-b07
+8244c2d885d412c07ae63b502d0b1f8cf4f9f38d jdk8u75-b08
+1b3ef7edccbcee10699c647da23b98cfe7ec1ed7 jdk8u75-b09
+e926cbc930ff727229191242a145ac625ddd7fa0 jdk8u75-b10
+ce9b845453027a7a6309398b1ca2f32cf1534ae5 jdk8u75-b12
+8cc52edbb741c42e09f4b132ca0a759d3de6f848 jdk8u77-b00
+8f0ed89698a28138065b6b941769650627636745 jdk8u77-b01
+27f1130320a55b6b89024cb8baa93c8767c516d2 jdk8u77-b02
+ce45ec06ff239525fb01cf7a6e4304cee0c678e5 icedtea-3.0.0pre10
+4ed5441e40e13782b5ee8bfb55fa252a4ab436af icedtea-3.0.0
+1833af452741c2267bdbbb6801963d9d3953598d icedtea-3.0-branchpoint
+1c71899e85662239085fab94ad5c26441e7a80cd jdk8u77-b03
+6b0d1f04c4808aaab32771e0892ac83e66714ecb jdk8u91-b00
+817898d53814da42f567995c921f3ea90016dccc jdk8u91-b13
+f6bda5729ff86e9691cd51f04261c3942974cecc jdk8u91-b14
+8b0bf55a041ae5657b1ae9e74e68258e8d36dda4 jdk8u91-b15
acbcb6682c9b3e66f9cc61a6a62e8cb5f24c75d3 jdk8u76-b00
b3c914ad842d61818e0c5850409f77478b13acc6 jdk8u76-b01
7711933ec18462ece8a1b9a9527ec873c520b1ab jdk8u76-b02
11dd1c13f1bd75f58fc0b020c767f2c331abb2a7 jdk8u76-b03
1cc1c3510fd8b9fa2a18bfad3984ca16069f013e jdk8u76-b04
+ec9701b3846be6da61b15c3b1f453077404f7b6a jdk8u76-b05
+ce8019f21943996b9770e8f9d35a6c076c73bb82 jdk8u76-b06
+3f1a028c152eaa1cf9ca97ed6c7ebc239b0967be jdk8u76-b07
+74c0b275d2ddc6e197677adc28532ee6025559a6 jdk8u76-b08
+2e5841f57df44b0f49e49ef3b827a7babf51bca7 jdk8u76-b09
+8c4b258892025ee4d5df4109f974ba4665ee1208 jdk8u76-b10
+6afc87bdaa7b93855e152aad437305ce0a42251a jdk8u76-b11
+233768376a3649b3f1f4653fe1c433271fc776ee jdk8u76-b12
+7e43e115dfafee70152a01b99aa9de25b4410570 jdk8u92-b00
+1bce84411d37ecf9a4335d1348f4b2f0b7ab6e08 jdk8u92-b13
+4a6f560bdbe166a2ff0855221dd5fbe9a19e562b icedtea-3.1.0pre01
+6ee6f8ac74894acb6ad4b821c2ec393a5ef34108 icedtea-3.1.0pre02
+5c97913ea9f75839624308aac8e960444909f2c8 icedtea-3.1.0pre03
+0de4d7e1996f4c7d3cd5af3d92ddb70762e9b6a7 icedtea-3.1.0pre04
+fb9f98ed6ef2505a424864f0a9468e59298fede6 jdk8u92-b14
+ac887193179bae82fd1cdf4d8c463457163a6535 jdk8u92-b31
+cb072b12f5dbe3a249d596078d98a34ec9364187 jdk8u81-b00
+fb5e0a18ad7d49134616879d1a500b1356e12fd4 jdk8u101-b01
+c7aeb4e55b0f7de8c5bd2a6e41dc5c54c4239271 jdk8u101-b02
+c678c1a31a553ebe7a8fd3888acc282dbd975e3b jdk8u101-b03
+a6a032a5490f4000bdfb25a2f604b22bcdf95ecf jdk8u101-b04
+80f389596bfaa22d4d2282b8417b98a53241f2aa jdk8u101-b05
+03f2bf9410ef2aad8d8a5ab0432ae0dbdf8bfd62 jdk8u101-b06
+39e620ddf0bb8c6a6d6f0588c71d5f43d8bcc987 jdk8u101-b07
+20b4715976338d4307c2d70e205ce88f31fbd7e7 jdk8u101-b08
+97939d061a0e492c6c2b464df44373165ecc15d2 jdk8u101-b09
+0066fe71b1203e103f7e1a2354bd94f65fdf38fd jdk8u101-b10
+0878a0a5fdabeec872e878f4737d96edee8b1393 jdk8u101-b11
+ddcc10eeb9d3367eb4b3fa0cd4d118e6dbc8850e jdk8u101-b12
+9368913c75fa32e0cf33c542ed72e0146d84401d icedtea-3.1.0
+2acc40d95975e9a4b637e6752780570910ab75f9 icedtea-3.2.0pre01
+8ee36eca2124f4ea14d0b7ef844d5d7070eb0dd1 jdk8u101-b13
+acbcb6682c9b3e66f9cc61a6a62e8cb5f24c75d3 jdk8u76-b00
+b3c914ad842d61818e0c5850409f77478b13acc6 jdk8u76-b01
+7711933ec18462ece8a1b9a9527ec873c520b1ab jdk8u76-b02
+11dd1c13f1bd75f58fc0b020c767f2c331abb2a7 jdk8u76-b03
+1cc1c3510fd8b9fa2a18bfad3984ca16069f013e jdk8u76-b04
+b96204430344538b19eea491a8cb4ad1ba711c39 jdk8u102-b00
+b96204430344538b19eea491a8cb4ad1ba711c39 jdk8u82-b00
+7ae23fadd851d39b3c4f1a88cdb5e087e174afd5 jdk8u102-b01
+760d26dbaa27603ee94a746e47f166e6470290c2 jdk8u102-b02
+9be3e75c8f466e69f21a0894731a3863d48bcf43 jdk8u102-b03
+58469c50677dfcf88b7b2f740ac71c7e1d1dd1d2 jdk8u102-b04
+f5cb21e3a36196f1c8c224d6b17d88dec37f7e49 jdk8u102-b05
+545ae88cd091d1e362537971b0c6f1b8d4327b9e jdk8u102-b06
+f563e46f3083e1c542a6bf3e11547d297c9da8fa jdk8u102-b07
+c9f8318eb6315719d79a3fa4791d73da42e73fe2 jdk8u102-b08
+8f5ebb91ab3a341a6f7db7ede8113a4f52a6ab26 jdk8u102-b09
+018c7ebb858c5cd3af8e9b11b03e4e05663250b4 jdk8u102-b10
+429621d25778abb1ab7a0ede8dc48d5606f76108 jdk8u102-b11
+fef62f7eb59982f2c92a3bb135c6ae4d6a466328 jdk8u102-b12
+e9de037c3b4c7691662d996c49b42f3e639e65ee jdk8u102-b13
+b536766d32b31fb691bf2571a976c615eadfc23f icedtea-3.2.0pre02
diff -r b96204430344 -r 11f747b59cb0 .jcheck/conf
--- a/.jcheck/conf Mon Jan 25 13:22:15 2016 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
diff -r b96204430344 -r 11f747b59cb0 src/com/sun/org/apache/xalan/internal/XalanConstants.java
--- a/src/com/sun/org/apache/xalan/internal/XalanConstants.java Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/XalanConstants.java Mon Aug 08 15:51:26 2016 +0100
@@ -81,6 +81,14 @@
*/
public static final String JDK_GENERAL_ENTITY_SIZE_LIMIT =
ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
+
+ /**
+ * JDK node count limit in entities that limits the total number of nodes
+ * in all of entity references.
+ */
+ public static final String JDK_ENTITY_REPLACEMENT_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "entityReplacementLimit";
+
/**
* JDK maximum parameter entity size limit
*/
@@ -137,6 +145,13 @@
* JDK maximum general entity size limit
*/
public static final String SP_GENERAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
+
+ /**
+ * JDK node count limit in entities that limits the total number of nodes
+ * in all of entity references.
+ */
+ public static final String SP_ENTITY_REPLACEMENT_LIMIT = "jdk.xml.entityReplacementLimit";
+
/**
* JDK maximum parameter entity size limit
*/
diff -r b96204430344 -r 11f747b59cb0 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Mon Aug 08 15:51:26 2016 +0100
@@ -1356,8 +1356,8 @@
{ "optionLXCIN", " [-LXCIN compiledStylesheetFileNameIn]"},
{ "optionLXCOUT", " [-LXCOUT compiledStylesheetFileNameOutOut]"},
{ "optionPARSER", " [-PARSER fully qualified class name of parser liaison]"},
- { "optionE", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"},
- { "optionV", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"},
+ { "optionE", " [-E (Entityreferenzen nicht einblenden)]"},
+ { "optionV", " [-E (Entityreferenzen nicht einblenden)]"},
{ "optionQC", " [-QC (Stille Musterkonfliktwarnungen)]"},
{ "optionQ", " [-Q (Silent-Modus)]"},
{ "optionLF", " [-LF (Nur Zeilenvorsch\u00FCbe bei Ausgabe verwenden {Standard ist CR/LF})]"},
@@ -1381,7 +1381,7 @@
{ "noParsermsg4", "Wenn Sie nicht \u00FCber den XML-Parser f\u00FCr Java von IBM verf\u00FCgen, k\u00F6nnen Sie ihn hier herunterladen:"},
{ "noParsermsg5", "IBMs AlphaWorks: http://www.alphaworks.ibm.com/formula/xml"},
{ "optionURIRESOLVER", " [-URIRESOLVER full class name (URIResolver f\u00FCr die Aufl\u00F6sung von URIs)]"},
- { "optionENTITYRESOLVER", " [-ENTITYRESOLVER full class name (EntityResolver f\u00FCr die Aufl\u00F6sung von Entit\u00E4ten)]"},
+ { "optionENTITYRESOLVER", " [-ENTITYRESOLVER full class name (EntityResolver f\u00FCr die Aufl\u00F6sung von Entitys)]"},
{ "optionCONTENTHANDLER", " [-CONTENTHANDLER full class name (ContentHandler f\u00FCr die Serialisierung der Ausgabe)]"},
{ "optionLINENUMBERS", " [-L use line numbers for source document]"},
{ "optionSECUREPROCESSING", " [-SECURE (Feature f\u00FCr die sichere Verarbeitung auf \"true\" setzen.)]"},
diff -r b96204430344 -r 11f747b59cb0 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java Mon Aug 08 15:51:26 2016 +0100
@@ -588,7 +588,7 @@
"\uC2A4\uD0C0\uC77C\uC2DC\uD2B8 \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC74C: {0}"},
{ ER_IOEXCEPTION,
- "\uC2A4\uD0C0\uC77C\uC2DC\uD2B8 \uD30C\uC77C\uC5D0 IO \uC608\uC678 \uC0AC\uD56D \uBC1C\uC0DD: {0}"},
+ "\uC2A4\uD0C0\uC77C\uC2DC\uD2B8 \uD30C\uC77C\uC5D0 IO \uC608\uC678\uC0AC\uD56D \uBC1C\uC0DD: {0}"},
{ ER_NO_HREF_ATTRIB,
"(StylesheetHandler) {0}\uC5D0 \uB300\uD55C href \uC18D\uC131\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
@@ -714,7 +714,7 @@
"processStylesheet\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4!"},
{ ER_SAX_EXCEPTION,
- "SAX \uC608\uC678 \uC0AC\uD56D"},
+ "SAX \uC608\uC678\uC0AC\uD56D"},
// add this message to fix bug 21478
{ ER_FUNCTION_NOT_SUPPORTED,
@@ -1322,7 +1322,7 @@
{ "help_language", "ko" },
{ "language", "ko" },
{ "BAD_CODE", "createMessage\uC5D0 \uB300\uD55C \uB9E4\uAC1C\uBCC0\uC218\uAC00 \uBC94\uC704\uB97C \uBC97\uC5B4\uB0AC\uC2B5\uB2C8\uB2E4."},
- { "FORMAT_FAILED", "messageFormat \uD638\uCD9C \uC911 \uC608\uC678 \uC0AC\uD56D\uC774 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4."},
+ { "FORMAT_FAILED", "messageFormat \uD638\uCD9C \uC911 \uC608\uC678\uC0AC\uD56D\uC774 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4."},
{ "version", ">>>>>>> Xalan \uBC84\uC804 "},
{ "version2", "<<<<<<<"},
{ "yes", "\uC608"},
diff -r b96204430344 -r 11f747b59cb0 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java Mon Aug 08 15:51:26 2016 +0100
@@ -1265,7 +1265,7 @@
"\u627E\u4E0D\u5230\u5341\u9032\u4F4D\u683C\u5F0F\u7684\u5BA3\u544A: {0}"},
{ WG_OLD_XSLT_NS,
- "\u907A\u6F0F\u6216\u4E0D\u6B63\u78BA\u7684 XSLT \u547D\u540D\u7A7A\u9593\u3002 "},
+ "\u907A\u6F0F\u6216\u4E0D\u6B63\u78BA\u7684 XSLT \u547D\u540D\u7A7A\u9593\u3002"},
{ WG_ONE_DEFAULT_XSLDECIMALFORMAT_ALLOWED,
"\u53EA\u5141\u8A31\u4E00\u500B\u9810\u8A2D\u7684 xsl:decimal-format \u5BA3\u544A\u3002"},
diff -r b96204430344 -r 11f747b59cb0 src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
--- a/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java Mon Aug 08 15:51:26 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -26,6 +26,8 @@
package com.sun.org.apache.xalan.internal.utils;
import com.sun.org.apache.xalan.internal.XalanConstants;
+import java.util.concurrent.CopyOnWriteArrayList;
+import org.xml.sax.SAXException;
/**
@@ -80,7 +82,9 @@
MAX_ELEMENT_DEPTH_LIMIT("MaxElementDepthLimit", XalanConstants.JDK_MAX_ELEMENT_DEPTH,
XalanConstants.SP_MAX_ELEMENT_DEPTH, 0, 0),
MAX_NAME_LIMIT("MaxXMLNameLimit", XalanConstants.JDK_XML_NAME_LIMIT,
- XalanConstants.SP_XML_NAME_LIMIT, 1000, 1000);
+ XalanConstants.SP_XML_NAME_LIMIT, 1000, 1000),
+ ENTITY_REPLACEMENT_LIMIT("EntityReplacementLimit", XalanConstants.JDK_ENTITY_REPLACEMENT_LIMIT,
+ XalanConstants.SP_ENTITY_REPLACEMENT_LIMIT, 0, 3000000);
final String key;
final String apiProperty;
@@ -415,6 +419,23 @@
}
+ // Array list to store printed warnings for each SAX parser used
+ private static final CopyOnWriteArrayList<String> printedWarnings = new CopyOnWriteArrayList<>();
+
+ /**
+ * Prints out warnings if a parser does not support the specified feature/property.
+ *
+ * @param parserClassName the name of the parser class
+ * @param propertyName the property name
+ * @param exception the exception thrown by the parser
+ */
+ public static void printWarning(String parserClassName, String propertyName, SAXException exception) {
+ String key = parserClassName+":"+propertyName;
+ if (printedWarnings.addIfAbsent(key)) {
+ System.err.println( "Warning: "+parserClassName+": "+exception.getMessage());
+ }
+ }
+
/**
* Read from system properties, or those in jaxp.properties
*
diff -r b96204430344 -r 11f747b59cb0 src/com/sun/org/apache/xalan/internal/xsltc/DOM.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java Mon Aug 08 15:51:26 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,9 +17,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * $Id: DOM.java,v 1.2.4.1 2005/08/31 10:18:49 pvedula Exp $
- */
package com.sun.org.apache.xalan.internal.xsltc;
@@ -102,4 +99,5 @@
public int getDocument();
public String getUnparsedEntityURI(String name);
public Map<String, Integer> getElementsWithIDs();
+ public void release();
}
diff -r b96204430344 -r 11f747b59cb0 src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java Mon Aug 08 15:51:26 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,9 +17,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * $Id: ApplyTemplates.java,v 1.2.4.1 2005/09/12 09:59:21 pvedula Exp $
- */
package com.sun.org.apache.xalan.internal.xsltc.compiler;
@@ -120,12 +117,10 @@
final int current = methodGen.getLocalIndex("current");
// check if sorting nodes is required
- final Vector sortObjects = new Vector();
- final Iterator<SyntaxTreeNode> children = elements();
- while (children.hasNext()) {
- final SyntaxTreeNode child = children.next();
+ final Vector<Sort> sortObjects = new Vector<>();
+ for (final SyntaxTreeNode child : getContents()) {
if (child instanceof Sort) {
- sortObjects.addElement(child);
+ sortObjects.addElement((Sort)child);
}
}
@@ -191,6 +186,13 @@
applyTemplatesSig);
il.append(new INVOKEVIRTUAL(applyTemplates));
+ // unmap parameters to release temporary result trees
+ for (final SyntaxTreeNode child : getContents()) {
+ if (child instanceof WithParam) {
+ ((WithParam)child).releaseResultTree(classGen, methodGen);
+ }
+ }
+
// Pop parameter frame
if (stylesheet.hasLocalParams() || hasContents()) {
il.append(classGen.loadTranslet());
diff -r b96204430344 -r 11f747b59cb0 src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java Mon Aug 08 15:51:26 2016 +0100
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -17,18 +16,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * $Id: CallTemplate.java,v 1.2.4.1 2005/09/12 10:02:41 pvedula Exp $
- */
package com.sun.org.apache.xalan.internal.xsltc.compiler;
-import com.sun.org.apache.bcel.internal.generic.ALOAD;
-import com.sun.org.apache.bcel.internal.generic.ASTORE;
import com.sun.org.apache.bcel.internal.generic.ConstantPoolGen;
import com.sun.org.apache.bcel.internal.generic.INVOKEVIRTUAL;
import com.sun.org.apache.bcel.internal.generic.InstructionList;
-import com.sun.org.apache.bcel.internal.generic.LocalVariableGen;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ClassGenerator;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.MethodGenerator;
@@ -56,7 +49,7 @@
* this array can be either a WithParam or a Param if no WithParam
* exists for a particular parameter.
*/
- private Object[] _parameters = null;
+ private SyntaxTreeNode[] _parameters = null;
/**
* The corresponding template which this CallTemplate calls.
@@ -147,11 +140,10 @@
// If calling a simply named template, push actual arguments
if (_calleeTemplate != null) {
- Vector calleeParams = _calleeTemplate.getParameters();
int numParams = _parameters.length;
for (int i = 0; i < numParams; i++) {
- SyntaxTreeNode node = (SyntaxTreeNode)_parameters[i];
+ SyntaxTreeNode node = _parameters[i];
methodSig.append(OBJECT_SIG); // append Object to signature
// Push 'null' if Param to indicate no actual parameter specified
@@ -170,6 +162,15 @@
methodName,
methodSig.toString())));
+ // release temporary result trees
+ if (_parameters != null) {
+ for (int i = 0; i < _parameters.length; i++) {
+ if (_parameters[i] instanceof WithParam) {
+ ((WithParam)_parameters[i]).releaseResultTree(classGen, methodGen);
+ }
+ }
+ }
+
// Do not need to call Translet.popParamFrame() if we are
// calling a simple named template.
if (_calleeTemplate == null && (stylesheet.hasLocalParams() || hasContents())) {
More information about the distro-pkg-dev
mailing list