Mercurial > jdk8-mips64-public > jaxws / changeset

     1.1 --- a/.hgtags	Mon Jul 10 15:54:42 2017 -0700
     1.2 +++ b/.hgtags	Mon Jul 17 14:08:28 2017 -0700
     1.3 @@ -701,11 +701,13 @@
     1.4  d8134565e6c8cab3ccd0e356c787e0aa75ef68ee jdk8u141-b12
     1.5  27d35df45162afdf75b76983fcf11e1cbf2e3001 jdk8u141-b13
     1.6  65d3b0e445513e024157635b970660b1e7211937 jdk8u141-b14
     1.7 +c62448650df40092f0324e34f35aa9f3940e9928 jdk8u141-b15
     1.8  eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00
     1.9  c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01
    1.10  d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02
    1.11  4c06ef2757dedeffa5f61acad42c36cbb3496e69 jdk8u151-b03
    1.12  04a80aaab394ef20a3cdfcd04f1498349f691738 jdk8u151-b04
    1.13 +730acb5d508e3cb852c2dae222717aa4593e6bb9 jdk8u151-b05
    1.14  ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00
    1.15  2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01
    1.16  b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02

     2.1 --- a/THIRD_PARTY_README	Mon Jul 10 15:54:42 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Mon Jul 17 14:08:28 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.11, which may be included 
     2.8 +%% This notice is provided with respect to zlib v1.2.8, 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.11, January 15th, 2017
    2.14 +  version 1.2.8, April 28th, 2013
    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	Mon Jul 10 15:54:42 2017 -0700
     3.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java	Mon Jul 17 14:08:28 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      }