Mercurial > hg > openjdk > jdk8u > jaxp
changeset 1623:d939047993da jdk8u162-b02
Merge
author | asaha |
---|---|
date | Wed, 04 Oct 2017 14:25:16 -0700 |
parents | e2d6ab228b1e (current diff) e85e84dd9244 (diff) |
children | 190cfe837d60 |
files | .hgtags |
diffstat | 5 files changed, 53 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Oct 03 18:41:06 2017 -0700 +++ b/.hgtags Wed Oct 04 14:25:16 2017 -0700 @@ -715,6 +715,46 @@ 5790500308c0e7c2e7f1068c5ff5c76c1d54497d jdk8u141-b15 4fe0f48f801c4262dfb964635ae5f2e7344326f4 jdk8u144-b00 330bd721dee5b3680eea869efed01f481fb095df jdk8u144-b01 +7dfdf274dbb6c944e09faf2334312821dade36d3 jdk8u151-b00 +2ab7976c6978b24f70a9f703db964e7e08f9c5ef jdk8u151-b01 +7dc4280622febe9a8dee40850d6f848c14dfac82 jdk8u151-b02 +c88f8b48f916a354bda6186f7cc3ba6cda0c3942 jdk8u151-b03 +b093ba0cc1da2bde9d3f1b47057c0002928e6121 jdk8u151-b04 +202d9386f011016b0c83bcc98e78966a42eec284 jdk8u151-b05 +67150ea02ae49888b0300ef8baf2dcf90beb45ff jdk8u151-b06 +838cb61b03b84ec86dd2685a40d7d278236946f5 jdk8u151-b07 +4e43afdbc6017a6dd7be40e7a41cd0dd38a499a0 jdk8u151-b08 +31fae39926290b04fd8fe181a561c1621338358e jdk8u151-b09 +f1554c8d8b6d3b11b3c65f79d330b88164deeb70 jdk8u151-b10 +5cbd2bde5ac9bf44a704d1c08240ecfb60a38654 jdk8u151-b11 +e4c2fef7ae746db44424da15ec2273610a8ce458 jdk8u151-b12 +2e5a470691f23ebf8d1f0f0dea8ef7de9a70a943 jdk8u122-b00 +cbb8efe139275a4e7c541f9e45eb410c27a5ea61 jdk8u122-b01 +e279f24557d43d8edfe313cb1a53add7ac6ceb2c jdk8u122-b02 +4d0371f160495cc61e3b57ca2d57884c2b9f9068 jdk8u122-b03 +4d0371f160495cc61e3b57ca2d57884c2b9f9068 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +95728234c69f848fda20c3d107a2a14405e8e8bd jdk8u122-b03 +540ca507f5e33ad46c85750f5df110522454cb2d jdk8u122-b04 +7f6d0e9a119670bb83ab2961503471d73f8a5f7e jdk8u132-b00 +4203c092a35355406709027827e9130f79dd96ca jdk8u152-b00 +bedfdbc290ac3c771c107a644250c1985f26fb2f jdk8u152-b01 +519a2d274fd0e2f83317e08b6d891c25d56d7405 jdk8u152-b02 +a7f773d06b75f04b44166316bbb4a0244d127d14 jdk8u152-b03 +65ec92c434b62ad9b1dd0a5280ac0030dd275775 jdk8u152-b04 +3a66a08564badcbef3e60d050647437416bce068 jdk8u152-b05 +acb6450dffcf8cfbe72fef501d0d287adbf8dd43 jdk8u152-b06 +5487838dba527fe94e197bfccb9bca58e7563b0b jdk8u152-b07 +d36b0186befa153f155302f394797ddcacbcaf70 jdk8u152-b08 +3e9d12fac1d0737a0726ec10c1abb4b8fa75a56c jdk8u152-b09 +9a4e0d4984a41d7413fbd4cbf12b53a3631a1132 jdk8u152-b10 +910f70805a76d62f11aaac6fb81a249756c43571 jdk8u152-b11 +228115c9db82ccc7955ff1bfea8c1f11d90d7f6f jdk8u152-b12 +1005fdca8d86e3fcbaf0f76d811a7073469c5da4 jdk8u152-b13 +7a543f1b03bf40d19769ee8538713a7ab3df72ac jdk8u152-b14 +577537bbd850bbe03e480c44941ee1dc28f60d4f jdk8u152-b15 +6a1402a0b31d25d607d7cf0c20cf8f1a2d17711c jdk8u152-b16 2e5a470691f23ebf8d1f0f0dea8ef7de9a70a943 jdk8u122-b00 cbb8efe139275a4e7c541f9e45eb410c27a5ea61 jdk8u122-b01 e279f24557d43d8edfe313cb1a53add7ac6ceb2c jdk8u122-b02
--- a/THIRD_PARTY_README Tue Oct 03 18:41:06 2017 -0700 +++ b/THIRD_PARTY_README Wed Oct 04 14:25:16 2017 -0700 @@ -2808,12 +2808,12 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.8, which may be included +%% This notice is provided with respect to zlib v1.2.11, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.8, April 28th, 2013 + version 1.2.11, January 15th, 2017 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties Tue Oct 03 18:41:06 2017 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties Wed Oct 04 14:25:16 2017 -0700 @@ -186,7 +186,7 @@ e-props-correct.2 = e-props-correct.2: ''{0}'' \uC694\uC18C\uC758 \uAC12 \uC81C\uC57D \uC870\uAC74 \uAC12 ''{1}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. e-props-correct.4 = e-props-correct.4: ''{0}'' \uC694\uC18C\uC758 '{'type definition'}'\uC774 substitutionHead ''{1}''\uC758 '{'type definition'}'\uC5D0\uC11C \uC801\uD569\uD558\uAC8C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2C8\uAC70\uB098 ''{1}''\uC758 '{'substitution group exclusions'}' \uC18D\uC131\uC774 \uC774 \uD30C\uC0DD\uC744 \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. e-props-correct.5 = e-props-correct.5: \uC694\uC18C\uC758 '{'type definition'}' \uB610\uB294 '{'type definition'}'\uC758 '{'content type'}'\uC774 ID\uC774\uAC70\uB098 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uAC83\uC774\uBBC0\uB85C '{'value constraint'}'\uB294 ''{0}'' \uC694\uC18C\uC5D0 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4. - e-props-correct.6 = e-props-correct.6: ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD55C \uC21C\uD658 \uB300\uCCB4 \uADF8\uB8F9\uC774 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4.. + e-props-correct.6 = e-props-correct.6: ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD55C \uC21C\uD658 \uB300\uCCB4 \uADF8\uB8F9\uC774 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. fractionDigits-valid-restriction = fractionDigits-valid-restriction: {2}\uC758 \uC815\uC758\uC5D0\uC11C ''fractionDigits'' \uBA74\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC774 \uAC12\uC740 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''{1}''(\uC73C)\uB85C \uC124\uC815\uB41C ''fractionDigits''\uC5D0 \uB300\uD55C \uAC12\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4. fractionDigits-totalDigits = fractionDigits-totalDigits: {2}\uC758 \uC815\uC758\uC5D0\uC11C ''fractionDigits'' \uBA74\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC774 \uAC12\uC740 ''totalDigits''\uC5D0 \uB300\uD55C \uAC12\uC778 ''{1}''\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4. length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: {0} \uC720\uD615\uC758 \uACBD\uC6B0 length ''{1}''\uC758 \uAC12\uC740 minLength ''{2}''\uC758 \uAC12\uBCF4\uB2E4 \uC791\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
--- a/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java Tue Oct 03 18:41:06 2017 -0700 +++ b/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java Wed Oct 04 14:25:16 2017 -0700 @@ -224,7 +224,7 @@ "La clonaci\u00F3n del iterador no est\u00E1 soportada"}, { ER_UNKNOWN_AXIS_TYPE, - "Tipo transversal de eje desconocido: {0}"}, + "Tipo de recorrido de eje desconocido: {0}"}, { ER_AXIS_NOT_SUPPORTED, "Traverser de eje no soportado: {0}"},
--- a/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java Tue Oct 03 18:41:06 2017 -0700 +++ b/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java Wed Oct 04 14:25:16 2017 -0700 @@ -1,6 +1,5 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. */ /* * Copyright 1999-2004 The Apache Software Foundation. @@ -70,6 +69,14 @@ { stream.defaultReadObject(); m_predicateIndex = -1; + + /** + * Initialize to the declared value. + * As noted at declaration, this variable is used only for clones for getLastPos, + * it should have been excluded from serialization. For compatibility, we'll + * keep it as is but initializing to the declared value. + */ + m_predCount = -1; resetProximityPositions(); } catch (ClassNotFoundException cnfe)