Mercurial > hg > icedtea8-forest > jaxp
changeset 1688:d36b0186befa jdk8u152-b08
Merge
author | asaha |
---|---|
date | Mon, 17 Jul 2017 14:07:52 -0700 |
parents | 1fe50fa80e32 (current diff) 53498ccead1c (diff) |
children | e0f26781cdc3 |
files | .hgtags |
diffstat | 3 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 10 15:54:37 2017 -0700 +++ b/.hgtags Mon Jul 17 14:07:52 2017 -0700 @@ -712,11 +712,13 @@ 790fea8778f49a14e461ef9897109395d7b8ae30 jdk8u141-b12 5c33c65a916e02794d3d0c82648bbb8138e20023 jdk8u141-b13 a907feb04fc1f737117deb331dabb32eb5d68f43 jdk8u141-b14 +5790500308c0e7c2e7f1068c5ff5c76c1d54497d jdk8u141-b15 7dfdf274dbb6c944e09faf2334312821dade36d3 jdk8u151-b00 2ab7976c6978b24f70a9f703db964e7e08f9c5ef jdk8u151-b01 7dc4280622febe9a8dee40850d6f848c14dfac82 jdk8u151-b02 c88f8b48f916a354bda6186f7cc3ba6cda0c3942 jdk8u151-b03 b093ba0cc1da2bde9d3f1b47057c0002928e6121 jdk8u151-b04 +202d9386f011016b0c83bcc98e78966a42eec284 jdk8u151-b05 2e5a470691f23ebf8d1f0f0dea8ef7de9a70a943 jdk8u122-b00 cbb8efe139275a4e7c541f9e45eb410c27a5ea61 jdk8u122-b01 e279f24557d43d8edfe313cb1a53add7ac6ceb2c jdk8u122-b02
--- a/THIRD_PARTY_README Mon Jul 10 15:54:37 2017 -0700 +++ b/THIRD_PARTY_README Mon Jul 17 14:07:52 2017 -0700 @@ -2808,12 +2808,12 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.11, which may be included +%% This notice is provided with respect to zlib v1.2.8, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.11, January 15th, 2017 + version 1.2.8, April 28th, 2013 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
--- a/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java Mon Jul 10 15:54:37 2017 -0700 +++ b/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java Mon Jul 17 14:07:52 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)