Mercurial > hg > openjdk > bsd-port > jaxws
changeset 1238:21f3d7498fe8 default tip
Merge from main OpenJDK repository
author | Greg Lewis <glewis@eyesbeyond.com> |
---|---|
date | Sat, 03 Feb 2018 14:01:50 -0800 |
parents | 4626d69ba2c7 (current diff) 03446d6b6d14 (diff) |
children | |
files | .hgtags |
diffstat | 3 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Sep 07 23:37:12 2017 -0700 +++ b/.hgtags Sat Feb 03 14:01:50 2018 -0800 @@ -616,3 +616,5 @@ 1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02 1f0dd7a7e0ccaa340db533da400bb83ca1ad3cf2 jdk7u151-b00 3233576db658552e8933b1cd86f5586507564f44 jdk7u151-b01 +4f5edec6f3d8b2fb8395f345364d159c90b98cd7 jdk7u161-b00 +a22ffaf9f3e8673569d8b16bb00b5b8e90368dc9 jdk7u161-b01
--- a/THIRD_PARTY_README Thu Sep 07 23:37:12 2017 -0700 +++ b/THIRD_PARTY_README Sat Feb 03 14:01:50 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
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java Thu Sep 07 23:37:12 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java Sat Feb 03 14:01:50 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, 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 @@ -32,6 +32,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * Represents a {@link WebServiceException} with @@ -119,13 +121,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); }