Mercurial > hg > release > icedtea7-forest-2.6 > jaxws
changeset 1334:6bf0906d4fb5
Merge jdk7u161-b00
author | andrew |
---|---|
date | Mon, 27 Nov 2017 06:51:24 +0000 |
parents | 58c5eb18be53 (current diff) a22ffaf9f3e8 (diff) |
children | 40c37fd3e5cb |
files | .hgtags src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java |
diffstat | 3 files changed, 18 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Nov 20 15:20:07 2017 +0000 +++ b/.hgtags Mon Nov 27 06:51:24 2017 +0000 @@ -676,3 +676,4 @@ 3233576db658552e8933b1cd86f5586507564f44 jdk7u151-b01 e17af60ebbd6a4cf4e75181ae474123e52eb0ebc icedtea-2.6.11 3e70a6a17fa92207e127c6160961e958377728cf icedtea-2.6.12pre01 +4f5edec6f3d8b2fb8395f345364d159c90b98cd7 jdk7u161-b00
--- a/THIRD_PARTY_README Mon Nov 20 15:20:07 2017 +0000 +++ b/THIRD_PARTY_README Mon Nov 27 06:51:24 2017 +0000 @@ -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 Mon Nov 20 15:20:07 2017 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java Mon Nov 27 06:51:24 2017 +0000 @@ -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); }