Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > corba
changeset 766:0f930b8d9cc6
Merge
author | asaha |
---|---|
date | Thu, 11 Sep 2014 14:41:51 -0700 |
parents | ced787f7545f (diff) f46df0af2ca8 (current diff) |
children | 36413182d5f5 |
files | .hgtags |
diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Sep 08 12:34:37 2014 -0700 +++ b/.hgtags Thu Sep 11 14:41:51 2014 -0700 @@ -329,3 +329,9 @@ 7e9a2027d0214019d66325fa7ca59cf8281fb43e jdk8u25-b14 5b2cb4935667cd02d7974b3b6fb6bf4092b5acae jdk8u25-b15 28d7f90e04e46ce8c633a2fbf0157d9e77db17c3 jdk8u25-b16 +7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u40-b00 +c5d9822a3c18cd9e274dfe99e91c33e02bd8f8f4 jdk8u40-b01 +504b4455570e14b7fc0a837a09c6401c603516d9 jdk8u40-b02 +91cd0ecdbe08eadf09ee89e64bf45360da8f2413 jdk8u40-b03 +f3969243c71a0f1c90f312ac755faad1deff3412 jdk8u40-b04 +740fea207f7045ab8ccc790867657d5c03a99eec jdk8u40-b05
--- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Mon Sep 08 12:34:37 2014 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Thu Sep 11 14:41:51 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 {