Mercurial > hg > release > icedtea7-forest-2.6 > jaxp

changeset 1432:4b3e076c33e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u161-b00
author andrew
date Mon, 27 Nov 2017 06:51:24 +0000
parents 31b22dbe4cd4 (current diff) edff5672dccb (diff)
children 1981a623381f
files .hgtags src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
diffstat 4 files changed, 15 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Nov 20 15:20:06 2017 +0000
+++ b/.hgtags	Mon Nov 27 06:51:24 2017 +0000
@@ -677,3 +677,4 @@
 57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01
 46f2d7395127d38d0f5fd9b270f4edeb8939b248 icedtea-2.6.11
 968b46df5f0e11aeec9382370067d86946e4b7ca icedtea-2.6.12pre01
+abbd3cb1e6623bb1705e75350a9c696311250504 jdk7u161-b00
--- a/THIRD_PARTY_README	Mon Nov 20 15:20:06 2017 +0000
+++ b/THIRD_PARTY_README	Mon Nov 27 06:51:24 2017 +0000
@@ -3134,14 +3134,14 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.3, which is included 
+%% This notice is provided with respect to zlib v1.2.11, which may be included 
 with JRE 7, JDK 7, and OpenJDK 7
 
 --- begin of LICENSE ---
 
-  version 1.2.3, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+  version 1.2.11, January 15th, 2017
+
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
--- a/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java	Mon Nov 20 15:20:06 2017 +0000
+++ b/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java	Mon Nov 27 06:51:24 2017 +0000
@@ -227,7 +227,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 Nov 20 15:20:06 2017 +0000
+++ b/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java	Mon Nov 27 06:51:24 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)