Mercurial > hg > openjdk > aarch64-port > corba

changeset 991:ab29580992f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 02 Mar 2015 12:02:07 -0800
parents cab2b99c6bb2 (diff) f45b782d5583 (current diff)
children 28a1dbd4bb9e
files .hgtags
diffstat 3 files changed, 31 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Feb 10 14:58:34 2015 -0800
+++ b/.hgtags	Mon Mar 02 12:02:07 2015 -0800
@@ -353,3 +353,29 @@
 705d3a4298f44f0a14925bfee5017f5824b6c0ca jdk8u31-b31
 072d325a052a5894019b74118803bf5fb9e30692 jdk8u31-b32
 bfd820cde577ba687222196e6c5159d9763df887 jdk8u31-b33
+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
+9c54cc92c0beb29179abbce272d3f5c8ba4ffd0e jdk8u40-b21
+4c7421f74674ebefb8e91eba59ab2a2db8c1abd7 jdk8u40-b22
+62f7faef5ed956cd481cae6216b22fdb4b6e3e46 jdk8u40-b23
+472aa5bae0e78614e873d56bcc31e7caba49963c jdk8u40-b24
+2220744100b8487976debff79e5d0c7d70738bda jdk8u40-b25
--- a/THIRD_PARTY_README	Tue Feb 10 14:58:34 2015 -0800
+++ b/THIRD_PARTY_README	Mon Mar 02 12:02:07 2015 -0800
@@ -3385,7 +3385,7 @@
 included with JRE 8, JDK 8, and OpenJDK 8.
 
   Apache Commons Math 3.2
-  Apache Derby 10.10.1.3        
+  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
--- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Tue Feb 10 14:58:34 2015 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Mon Mar 02 12:02:07 2015 -0800
@@ -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 {