Merge jdk8u242-b01

Thu, 17 Oct 2019 13:49:11 +0100

author
andrew
date
Thu, 17 Oct 2019 13:49:11 +0100
changeset 2518
6c540cfd2593
parent 2517
09109e8d8cfd
parent 2515
0e89f4ee1f28
child 2519
49b31f261653

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Sep 12 15:23:06 2019 -0400
     1.2 +++ b/.hgtags	Thu Oct 17 13:49:11 2019 +0100
     1.3 @@ -1046,3 +1046,8 @@
     1.4  41756665474f7bc4ffc591c23887678eb2490ea6 jdk8u232-b04
     1.5  52afbdfa7852542f5aa3021336ed7b7069c42997 jdk8u232-b05
     1.6  8a951fd037e245425bbfe061a426a2250096b1ea jdk8u242-b00
     1.7 +d9dd9b7ce13f7b6ff0124c47106cadf5499e7554 jdk8u232-b06
     1.8 +0f61e27241b57c8ed5cd9b4d0324ac0d3b0daf13 jdk8u232-b07
     1.9 +9fc2e50a5c2f98fce148bbe35e43fc17395e3afc jdk8u232-b08
    1.10 +fba077f48da23f914f13b11718464a547215b7f6 jdk8u232-b09
    1.11 +fba077f48da23f914f13b11718464a547215b7f6 jdk8u232-ga
     2.1 --- a/THIRD_PARTY_README	Thu Sep 12 15:23:06 2019 -0400
     2.2 +++ b/THIRD_PARTY_README	Thu Oct 17 13:49:11 2019 +0100
     2.3 @@ -2130,13 +2130,13 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1,
     2.8 +%% This notice is provided with respect to PC/SC Lite v1.8.24,
     2.9  which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12  
    2.13 -Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com>
    2.14 -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr>
    2.15 +Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com>
    2.16 +Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr>
    2.17  All rights reserved.
    2.18  
    2.19  Redistribution and use in source and binary forms, with or without
    2.20 @@ -2148,15 +2148,10 @@
    2.21  2. Redistributions in binary form must reproduce the above copyright
    2.22     notice, this list of conditions and the following disclaimer in the
    2.23     documentation and/or other materials provided with the distribution.
    2.24 -3. All advertising materials mentioning features or use of this software
    2.25 -   must display the following acknowledgement:
    2.26 -     This product includes software developed by: 
    2.27 -      David Corcoran <corcoran@linuxnet.com>
    2.28 -      http://www.linuxnet.com (MUSCLE)
    2.29 -4. The name of the author may not be used to endorse or promote products
    2.30 +3. The name of the author may not be used to endorse or promote products
    2.31     derived from this software without specific prior written permission.
    2.32  
    2.33 -Changes to this license can be made only by the copyright author with 
    2.34 +Changes to this license can be made only by the copyright author with
    2.35  explicit written consent.
    2.36  
    2.37  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     3.1 --- a/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java	Thu Sep 12 15:23:06 2019 -0400
     3.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java	Thu Oct 17 13:49:11 2019 +0100
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2010, 2019, 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 @@ -82,6 +82,8 @@
    3.11              }
    3.12          } catch (final PatternSyntaxException e2) {
    3.13              throwParserException("syntax", e2.getMessage());
    3.14 +        } catch (StackOverflowError e3) {
    3.15 +            throw new RuntimeException(e3);
    3.16          }
    3.17      }
    3.18  
     4.1 --- a/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java	Thu Sep 12 15:23:06 2019 -0400
     4.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java	Thu Oct 17 13:49:11 2019 +0100
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -82,6 +82,8 @@
    4.11              }
    4.12          } catch (final PatternSyntaxException | JOniException e2) {
    4.13              throwParserException("syntax", e2.getMessage());
    4.14 +        } catch (StackOverflowError e3) {
    4.15 +            throw new RuntimeException(e3);
    4.16          }
    4.17      }
    4.18  

mercurial