# HG changeset patch
# User Greg Lewis <glewis@eyesbeyond.com>
# Date 1517695309 28800
# Node ID 033842c83701749290fa72a1b605094ff15950ef
# Parent  c3298bf492b181b494bc63a2b09746ba20a7816b# Parent  d2c96b59a5c37ee63483920b4d8cae891c1743d1
Merge from main OpenJDK repository

diff -r c3298bf492b1 -r 033842c83701 .hgtags
--- a/.hgtags	Thu Sep 07 23:37:10 2017 -0700
+++ b/.hgtags	Sat Feb 03 14:01:49 2018 -0800
@@ -617,3 +617,5 @@
 b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02
 26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00
 57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01
+abbd3cb1e6623bb1705e75350a9c696311250504 jdk7u161-b00
+edff5672dccb2e5e02e5a628af0d561e61caf94e jdk7u161-b01
diff -r c3298bf492b1 -r 033842c83701 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Thu Sep 07 23:37:10 2017 -0700
+++ b/THIRD_PARTY_README	Sat Feb 03 14:01:49 2018 -0800
@@ -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
diff -r c3298bf492b1 -r 033842c83701 src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java
--- a/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java	Thu Sep 07 23:37:10 2017 -0700
+++ b/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java	Sat Feb 03 14:01:49 2018 -0800
@@ -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}"},
diff -r c3298bf492b1 -r 033842c83701 src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
--- a/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java	Thu Sep 07 23:37:10 2017 -0700
+++ b/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java	Sat Feb 03 14:01:49 2018 -0800
@@ -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)