Mercurial > hg > icedtea8-forest > jaxws
changeset 1480:eafb356c44d0 icedtea-3.6.0
Merge jdk8u151-b12
author | andrew |
---|---|
date | Mon, 30 Oct 2017 17:28:37 +0000 |
parents | f6c75f047ce7 (current diff) cce697096465 (diff) |
children | 77e08d2f7079 |
files | .hgtags |
diffstat | 3 files changed, 28 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Oct 30 14:53:57 2017 +0000 +++ b/.hgtags Mon Oct 30 17:28:37 2017 +0000 @@ -738,3 +738,16 @@ 8c2ac8bef689763d71725e55cef58666b890690b icedtea-3.6.0pre00 4fb91927293516e83de8047c99a71aceeea452e9 icedtea-3.6.0pre01 768279d73ebb3a96825e365eb6999abaa991c64a icedtea-3.6.0pre02 +d2226ba553ca545f9bf9ffa66254478faca378a2 jdk8u144-b01 +eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00 +c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01 +d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02 +4c06ef2757dedeffa5f61acad42c36cbb3496e69 jdk8u151-b03 +04a80aaab394ef20a3cdfcd04f1498349f691738 jdk8u151-b04 +730acb5d508e3cb852c2dae222717aa4593e6bb9 jdk8u151-b05 +2abea38c7ccedf1eabe9245ca9619cd006484a07 jdk8u151-b06 +4324e571f7fddf12b24fa8b9c4670ff1a3443b87 jdk8u151-b07 +1c0acbb50d5171b56c95b3abb2a92aee864beb35 jdk8u151-b08 +373e5d67f1f374a10d39e95963569db3949539e6 jdk8u151-b09 +f910c0bf9da82c7b1f10903f2e76eeee0a2e20be jdk8u151-b10 +3d15802f4ed80eb489bf0b25bff552bcf831276e jdk8u151-b11
--- a/THIRD_PARTY_README Mon Oct 30 14:53:57 2017 +0000 +++ b/THIRD_PARTY_README Mon Oct 30 17:28:37 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/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java Mon Oct 30 14:53:57 2017 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java Mon Oct 30 17:28:37 2017 +0000 @@ -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); }