Merge jdk8u162-b02

Wed, 04 Oct 2017 14:25:40 -0700

author
asaha
date
Wed, 04 Oct 2017 14:25:40 -0700
changeset 1448
0b606a477f3e
parent 1446
0f938baeda6c
parent 1447
14d19efa7e5c
child 1449
1c18ed39c7b6

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Oct 03 18:41:10 2017 -0700
     1.2 +++ b/.hgtags	Wed Oct 04 14:25:40 2017 -0700
     1.3 @@ -704,6 +704,19 @@
     1.4  c62448650df40092f0324e34f35aa9f3940e9928 jdk8u141-b15
     1.5  c57e086660a37470793e38b94d7abedb79489ce3 jdk8u144-b00
     1.6  d2226ba553ca545f9bf9ffa66254478faca378a2 jdk8u144-b01
     1.7 +eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00
     1.8 +c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01
     1.9 +d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02
    1.10 +4c06ef2757dedeffa5f61acad42c36cbb3496e69 jdk8u151-b03
    1.11 +04a80aaab394ef20a3cdfcd04f1498349f691738 jdk8u151-b04
    1.12 +730acb5d508e3cb852c2dae222717aa4593e6bb9 jdk8u151-b05
    1.13 +2abea38c7ccedf1eabe9245ca9619cd006484a07 jdk8u151-b06
    1.14 +4324e571f7fddf12b24fa8b9c4670ff1a3443b87 jdk8u151-b07
    1.15 +1c0acbb50d5171b56c95b3abb2a92aee864beb35 jdk8u151-b08
    1.16 +373e5d67f1f374a10d39e95963569db3949539e6 jdk8u151-b09
    1.17 +f910c0bf9da82c7b1f10903f2e76eeee0a2e20be jdk8u151-b10
    1.18 +3d15802f4ed80eb489bf0b25bff552bcf831276e jdk8u151-b11
    1.19 +cce697096465ebb06fc18835c355ba3ae265042b jdk8u151-b12
    1.20  ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00
    1.21  2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01
    1.22  b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02
    1.23 @@ -720,5 +733,16 @@
    1.24  98c698b1b09b6a31d5090a25aff8b7a6edb8d6ba jdk8u152-b03
    1.25  bcf7fc55388e4c9d771cd2ad38351a66bfcf27d9 jdk8u152-b04
    1.26  388cd26b19dbf7d3102653dd82c27027cd722066 jdk8u152-b05
    1.27 +199a8d03dde0da505f04c87ff72aabdd7022eec5 jdk8u152-b06
    1.28 +488a01f4ba30dc2eb7205a2800a37ade74cc3ad1 jdk8u152-b07
    1.29 +86c8e64c0df3e7f18cc98e820b08dde3b67ffabb jdk8u152-b08
    1.30 +bedae7043858b1e2cdef09d5dd68f4585320b5df jdk8u152-b09
    1.31 +e2061fccf2caaab7c4dea3fb5b0a34d883821ce4 jdk8u152-b10
    1.32 +4dc85ca7179702344f298f33c8373ee335dea82c jdk8u152-b11
    1.33 +e14e868648cdc00abd3aa40aeee2c14afcfe0cd3 jdk8u152-b12
    1.34 +62481eff71d45189ed8138ee00fa51b10671f2cf jdk8u152-b13
    1.35 +ef939329cecb82b62d75d76debc5d67246333edd jdk8u152-b14
    1.36 +199f7d9827f96ee2393f947405473b68372c0757 jdk8u152-b15
    1.37 +04128156e506e8375c1c97eafea773317e5719bc jdk8u152-b16
    1.38  0dd7f8a46659c0de85a99fd45e8a30993c567c42 jdk8u162-b00
    1.39  06086cb6c349be92c287645f4fb494f85feb33c7 jdk8u162-b01
     2.1 --- a/THIRD_PARTY_README	Tue Oct 03 18:41:10 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Wed Oct 04 14:25:40 2017 -0700
     2.3 @@ -2808,12 +2808,12 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to zlib v1.2.8, which may be included 
     2.8 +%% This notice is provided with respect to zlib v1.2.11, which may be included 
     2.9  with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12  
    2.13 -  version 1.2.8, April 28th, 2013
    2.14 +  version 1.2.11, January 15th, 2017
    2.15  
    2.16    Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
    2.17  
     3.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java	Tue Oct 03 18:41:10 2017 -0700
     3.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java	Wed Oct 04 14:25:40 2017 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -34,6 +34,8 @@
    3.11  import java.io.ObjectInputStream;
    3.12  import java.io.ObjectOutputStream;
    3.13  import java.io.Serializable;
    3.14 +import java.util.ArrayList;
    3.15 +import java.util.List;
    3.16  import javax.xml.ws.WebServiceException;
    3.17  
    3.18  /**
    3.19 @@ -117,13 +119,21 @@
    3.20          String resourceBundleName = (String) in.readObject();
    3.21          String key = (String) in.readObject();
    3.22          int len = in.readInt();
    3.23 -        if (len == -1) {
    3.24 +        if (len < -1) {
    3.25 +            throw new NegativeArraySizeException();
    3.26 +        } else if (len == -1) {
    3.27              args = null;
    3.28 -        } else {
    3.29 +        } else if (len < 255) {
    3.30              args = new Object[len];
    3.31              for (int i = 0; i < args.length; i++) {
    3.32                  args[i] = in.readObject();
    3.33              }
    3.34 +        } else {
    3.35 +            List<Object> argList = new ArrayList<>(Math.min(len, 1024));
    3.36 +            for (int i = 0; i < len; i++) {
    3.37 +                argList.add(in.readObject());
    3.38 +            }
    3.39 +            args = argList.toArray(new Object[argList.size()]);
    3.40          }
    3.41          msg = new LocalizableMessageFactory(resourceBundleName).getMessage(key,args);
    3.42      }

mercurial