Mercurial > hg > icedtea8-forest > jaxp

changeset 1647:947a7b1ce48b icedtea-3.6.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8u151-b12
author andrew
date Mon, 30 Oct 2017 17:28:36 +0000
parents d1564ab60cd2 (current diff) e4c2fef7ae74 (diff)
children bbc9bec35971
files .hgtags
diffstat 4 files changed, 25 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Oct 30 14:53:56 2017 +0000
+++ b/.hgtags	Mon Oct 30 17:28:36 2017 +0000
@@ -749,3 +749,16 @@
 a7fb5fa68e8505bc141bd36a0b5891bb81da2e21 icedtea-3.6.0pre00
 c8bf6508b7a525d95172355015fdf3df58f85787 icedtea-3.6.0pre01
 db1236756feadf8b1b5ea89d8879f8e6c2a2fb43 icedtea-3.6.0pre02
+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
--- a/THIRD_PARTY_README	Mon Oct 30 14:53:56 2017 +0000
+++ b/THIRD_PARTY_README	Mon Oct 30 17:28:36 2017 +0000
@@ -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/xml/internal/res/XMLErrorResources_es.java	Mon Oct 30 14:53:56 2017 +0000
+++ b/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java	Mon Oct 30 17:28:36 2017 +0000
@@ -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	Mon Oct 30 14:53:56 2017 +0000
+++ b/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java	Mon Oct 30 17:28:36 2017 +0000
@@ -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)