Mercurial > hg > icedtea8-forest > corba

changeset 840:6c974fba96cb icedtea-3.0.0pre03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8u40-b21
author andrew
date Fri, 27 Feb 2015 18:37:47 +0000
parents 809ea5347d99 (current diff) 9c54cc92c0be (diff)
children b493e7b682c9
files .hgtags
diffstat 3 files changed, 59 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Aug 29 16:52:43 2014 +0100
+++ b/.hgtags	Fri Feb 27 18:37:47 2015 +0000
@@ -313,3 +313,47 @@
 7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u20-b21
 7677bf14d105ca23ab045f5041ceb19ee88b86c6 jdk8u20-b22
 83ebbcc0dda5af02ee3d99756bf6c13da956a310 icedtea-3.0.0pre02
+919405d7316dfcbddee5ad8dd08905916df88e04 jdk8u20-b23
+34c930eaa6b591621afde05ca2e24571c91cdc9b jdk8u20-b24
+34c930eaa6b591621afde05ca2e24571c91cdc9b jdk8u20-b25
+37bde23c96f66912c44b1b893c08d4ad4cff5f4e jdk8u20-b26
+08aa9f55fe5bce1f04cfd2958f71e8df18643e29 jdk8u25-b00
+31f50e3c0dcbdfa7f11a895179065e6888c2cf3c jdk8u25-b01
+162703b7c2f16ce00d1b54a8f95d12eda9753eba jdk8u25-b02
+ddaa2a3e452c8fbb1a7046e743096d0f9489290e jdk8u25-b03
+a76e6e02711edbfab4931dc679cbd3df6169ec84 jdk8u25-b04
+2fab01326282ee9033c089933b2dc46aef127abd jdk8u25-b05
+76068779ea16c40a9d3c14751a3bbd6c21f09cfd jdk8u25-b06
+db4d845d6a4d71ef5e48a8888f71375b0e21959f jdk8u25-b07
+afd9d9e1bbb5ab77c95a8750d2df164e05088d09 jdk8u25-b08
+1322b445ab39930c50c3901f6c439aad99a62fe8 jdk8u25-b09
+2e6da97d338ad5a65bf07f9d9648dcb74b5776b4 jdk8u25-b10
+11f77cdff0b2a07fd89f439b044d9f10a15f8fd5 jdk8u25-b11
+f560274aec4f42283c10070921afae403a153de2 jdk8u25-b12
+987bd55824c4794c8784a47fc45ecd18a9c2a5c8 jdk8u25-b13
+7e9a2027d0214019d66325fa7ca59cf8281fb43e jdk8u25-b14
+5b2cb4935667cd02d7974b3b6fb6bf4092b5acae jdk8u25-b15
+28d7f90e04e46ce8c633a2fbf0157d9e77db17c3 jdk8u25-b16
+f46df0af2ca8c7d896de375c8edac8ce09318318 jdk8u25-b17
+ee069d67c12df902cdb06ecf1747f8ff9d495a61 jdk8u25-b18
+7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u40-b00
+c5d9822a3c18cd9e274dfe99e91c33e02bd8f8f4 jdk8u40-b01
+504b4455570e14b7fc0a837a09c6401c603516d9 jdk8u40-b02
+91cd0ecdbe08eadf09ee89e64bf45360da8f2413 jdk8u40-b03
+f3969243c71a0f1c90f312ac755faad1deff3412 jdk8u40-b04
+740fea207f7045ab8ccc790867657d5c03a99eec jdk8u40-b05
+ced787f7545f26c3b1fdd35119ff41aa79fe6e03 jdk8u40-b06
+0d09cb188d39b5abb759977b9020ef957a0374ed jdk8u40-b07
+8d4971881c6661c51276ddb84b8e314b37d8d742 jdk8u40-b08
+bf87d71911661f583b9300795c9472179b4b3506 jdk8u40-b09
+a6d92ff8b962af32e2a9d66e956ff885d4c574b1 jdk8u40-b10
+a6dd66098734f58bc0bf847e2ca6f9b335689b9c jdk8u40-b11
+f5c47f0074b4822486c97709503b8885078c80f0 jdk8u40-b12
+7f8454e2f02fc296661a083dd4373d582980a86f jdk8u40-b13
+d36513f2cf934eb2f6f665a259cbbf2af82930c0 jdk8u40-b14
+46bf2b74baf4fc2f27b4c9238f8da94b7fcb8fe5 jdk8u40-b15
+0d3a452720a58bc203869ad606a4ea346c14c291 jdk8u40-b16
+bff1a326ac97c543b9c271adebc9deeda974edb1 jdk8u40-b17
+a1e2c13de84e00f2aedf4c40e96347306ede84f3 jdk8u40-b18
+8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u40-b19
+445eceffc829e205037098115c26e38e85ea5f7c jdk8u40-b20
--- a/THIRD_PARTY_README	Fri Aug 29 16:52:43 2014 +0100
+++ b/THIRD_PARTY_README	Fri Feb 27 18:37:47 2015 +0000
@@ -2,7 +2,7 @@
 -----------------------------
 
 %% This notice is provided with respect to ASM Bytecode Manipulation 
-Framework v5.0, which may be included with JRE 8, and JDK 8, and 
+Framework v5.0.3, which may be included with JRE 8, and JDK 8, and 
 OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1471,7 +1471,7 @@
 version 2.0.
 
 The NSS libraries are supplied in executable form, built from unmodified
-NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
+NSS source code labeled with the "NSS_3_16_RTM" HG tag.
 
 The NSS source code is available in the OpenJDK source code repository at:
     jdk/test/sun/security/pkcs11/nss/src
@@ -3349,14 +3349,14 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.5, which may be included 
+%% This notice is provided with respect to zlib v1.2.8, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-  version 1.2.5, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+  version 1.2.8, April 28th, 2013
+
+  Copyright (C) 1995-2013 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
@@ -3382,11 +3382,11 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to the following which may be 
-included with JRE 8, JDK 8, and OpenJDK 8, except where noted:
-
-  Apache Commons Math 2.2
-  Apache Derby 10.10.1.2        [included with JDK 8]
-  Apache Jakarta BCEL 5.2 
+included with JRE 8, JDK 8, and OpenJDK 8.
+
+  Apache Commons Math 3.2
+  Apache Derby 10.11.1.2
+  Apache Jakarta BCEL 5.1 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XML Security for Java 1.5.4
   Apache Xalan-Java 2.7.1 
--- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Fri Aug 29 16:52:43 2014 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Fri Feb 27 18:37:47 2015 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -35,7 +35,8 @@
 import java.io.OutputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectOutput;
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.HashMap;
 
 import org.omg.CORBA.INTERNAL;
 
@@ -49,7 +50,7 @@
      */
     private class HookPutFields extends ObjectOutputStream.PutField
     {
-        private Hashtable fields = new Hashtable();
+        private Map<String,Object> fields = new HashMap<>();
 
         /**
          * Put the value of the named boolean field into the persistent field.
@@ -140,7 +141,6 @@
     public OutputStreamHook()
         throws java.io.IOException {
         super();
-
     }
 
     public void defaultWriteObject() throws IOException {