changeset 1399:86c8e64c0df3 jdk8u152-b08

Merge
author asaha
date Mon, 17 Jul 2017 14:08:28 -0700
parents 35319065ec13 7ce2bd0eda1f
children 0efe8eb21a7c
files .hgtags
diffstat 3 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 10 15:54:42 2017 -0700
+++ b/.hgtags	Mon Jul 17 14:08:28 2017 -0700
@@ -701,11 +701,13 @@
 d8134565e6c8cab3ccd0e356c787e0aa75ef68ee jdk8u141-b12
 27d35df45162afdf75b76983fcf11e1cbf2e3001 jdk8u141-b13
 65d3b0e445513e024157635b970660b1e7211937 jdk8u141-b14
+c62448650df40092f0324e34f35aa9f3940e9928 jdk8u141-b15
 eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00
 c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01
 d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02
 4c06ef2757dedeffa5f61acad42c36cbb3496e69 jdk8u151-b03
 04a80aaab394ef20a3cdfcd04f1498349f691738 jdk8u151-b04
+730acb5d508e3cb852c2dae222717aa4593e6bb9 jdk8u151-b05
 ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00
 2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01
 b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02
--- a/THIRD_PARTY_README	Mon Jul 10 15:54:42 2017 -0700
+++ b/THIRD_PARTY_README	Mon Jul 17 14:08:28 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/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java	Mon Jul 10 15:54:42 2017 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java	Mon Jul 17 14:08:28 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.ws.WebServiceException;
 
 /**
@@ -117,13 +119,21 @@
         String resourceBundleName = (String) in.readObject();
         String key = (String) in.readObject();
         int len = in.readInt();
-        if (len == -1) {
+        if (len < -1) {
+            throw new NegativeArraySizeException();
+        } else if (len == -1) {
             args = null;
-        } else {
+        } else if (len < 255) {
             args = new Object[len];
             for (int i = 0; i < args.length; i++) {
                 args[i] = in.readObject();
             }
+        } else {
+            List<Object> argList = new ArrayList<>(Math.min(len, 1024));
+            for (int i = 0; i < len; i++) {
+                argList.add(in.readObject());
+            }
+            args = argList.toArray(new Object[argList.size()]);
         }
         msg = new LocalizableMessageFactory(resourceBundleName).getMessage(key,args);
     }