Mercurial > hg > openjdk > aarch64-port > corba

changeset 878:ef278f51b59f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Fri, 24 Oct 2014 17:05:18 -0700
parents e60c0a6d6330 (current diff) 604ed45c7469 (diff)
children ef001b9debf4
files .hgtags
diffstat 2 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Oct 20 23:00:50 2014 -0700
+++ b/.hgtags	Fri Oct 24 17:05:18 2014 -0700
@@ -340,4 +340,16 @@
 1a7cc737d8081ffef73d88e94995f80d6a3dc8e0 jdk8u31-b03
 f24241b85fc90618d243f54202904ee202c44b7e jdk8u31-b04
 a3b616778301fe101bf3dcfa145d3bb4e8fc8941 jdk8u31-b05
+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
 5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00
--- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Mon Oct 20 23:00:50 2014 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Fri Oct 24 17:05:18 2014 -0700
@@ -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 {